From owner-p4-projects@FreeBSD.ORG  Sun Mar 29 05:47:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 518211065705; Sun, 29 Mar 2009 05:47:18 +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 F26E11065703
	for <perforce@FreeBSD.org>; Sun, 29 Mar 2009 05:47:17 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E0EAC8FC1C
	for <perforce@FreeBSD.org>; Sun, 29 Mar 2009 05:47:17 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2T5lHTZ079249
	for <perforce@FreeBSD.org>; Sun, 29 Mar 2009 05:47:17 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2T5lHqF079247
	for perforce@freebsd.org; Sun, 29 Mar 2009 05:47:17 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 29 Mar 2009 05:47:17 GMT
Message-Id: <200903290547.n2T5lHqF079247@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159965 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: Sun, 29 Mar 2009 05:47:19 -0000

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

Change 159965 by pgj@beehive on 2009/03/29 05:47:08

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#11 integrate

Differences ...

==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#11 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.59 2009/03/28 19:05:11 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.59 2009/03/28 19:05:11 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -2781,7 +2781,7 @@
 
   <entry id="giganetworking" category="namerica">
     <name>Giganetworking</name>
-    <url>www.giganetworking.com</url>
+    <url>http://www.giganetworking.com</url>
     <description>
       Consulting in the areas of Internet security and data defense
       mainly with open source software. Particular knowledge of

From owner-p4-projects@FreeBSD.ORG  Sun Mar 29 11:38:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C90110656E3; Sun, 29 Mar 2009 11:38:16 +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 306A610656D9
	for <perforce@freebsd.org>; Sun, 29 Mar 2009 11:38:16 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DE148FC2F
	for <perforce@freebsd.org>; Sun, 29 Mar 2009 11:38:16 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2TBcFel022213
	for <perforce@freebsd.org>; Sun, 29 Mar 2009 11:38:15 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2TBcFnQ022211
	for perforce@freebsd.org; Sun, 29 Mar 2009 11:38:15 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 29 Mar 2009 11:38:15 GMT
Message-Id: <200903291138.n2TBcFnQ022211@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 159969 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: Sun, 29 Mar 2009 11:38:23 -0000

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

Change 159969 by trasz@trasz_victim7 on 2009/03/29 11:37:28

	Remove VSYNCHRONIZE from VSTAT_PERMS.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#37 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#27 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#23 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#37 (text+ko) ====

@@ -245,9 +245,9 @@
 	/*
 	 * XXX: PRIV_VFS_STAT?
 	 */
-	if ((accmode & VSTAT_PERMS) &&
+	if ((accmode & (VSTAT_PERMS | VSYNCHRONIZE)) &&
 	    !priv_check_cred(cred, PRIV_VFS_READ, 0))
-		priv_granted |= VSTAT_PERMS;
+		priv_granted |= (VSTAT_PERMS | VSYNCHRONIZE);
 
 	if ((accmode & priv_granted) == accmode) {
 		if (privused != NULL)

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#27 (text+ko) ====

@@ -4304,7 +4304,7 @@
 		*accmode |= VADMIN;
 	}
 
-	*accmode &= ~VSTAT_PERMS;
+	*accmode &= ~(VSTAT_PERMS | VSYNCHRONIZE);
 
 	if (*accmode == 0) {
 		*error = 0;

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#23 (text+ko) ====

@@ -314,7 +314,6 @@
 #define	VWRITE			000000000200 /* write permission */
 #define	VREAD			000000000400 /* read permission */
 #define	VADMIN			000000010000 /* being the file owner */
-#define	VSTAT			000000020000 /* permission to retrieve attrs */
 #define	VAPPEND			000000040000 /* permission to write/append */
 /*
  * VEXPLICIT_DENY makes VOP_ACCESS(9) return EPERM or EACCES only
@@ -344,7 +343,7 @@
 /*
  * Permissions that were traditionally granted to everyone.
  */
-#define VSTAT_PERMS	(VSTAT | VREAD_ATTRIBUTES | VREAD_ACL | VSYNCHRONIZE)
+#define VSTAT_PERMS	(VREAD_ATTRIBUTES | VREAD_ACL)
 
 /*
  * Permissions that allow to change the state of the file in any way.

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 04:18:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 220911065674; Mon, 30 Mar 2009 04:18:23 +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 C915C106564A
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:18:22 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D6C48FC12
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:18:22 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U4IMTa002524
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:18:22 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U4IMZW002522
	for perforce@freebsd.org; Mon, 30 Mar 2009 04:18:22 GMT
	(envelope-from marcel@freebsd.org)
Date: Mon, 30 Mar 2009 04:18:22 GMT
Message-Id: <200903300418.n2U4IMZW002522@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 159987 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: Mon, 30 Mar 2009 04:18:24 -0000

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

Change 159987 by marcel@marcel_fbsdvm on 2009/03/30 04:17:29

	WIP flush.

Affected files ...

.. //depot/projects/nand/sys/geom/geom_nandsim.c#2 edit
.. //depot/projects/nand/sys/geom/geom_nandsim.h#1 add
.. //depot/projects/nand/usr.bin/nandsim/Makefile#1 add
.. //depot/projects/nand/usr.bin/nandsim/nandsim.c#1 add

Differences ...

==== //depot/projects/nand/sys/geom/geom_nandsim.c#2 (text+ko) ====

@@ -44,21 +44,25 @@
 #include <geom/geom.h>
 #include <geom/geom_int.h>
 
+#include "geom_nandsim.h"
+
+static d_close_t	g_nandsim_close;
+static d_ioctl_t	g_nandsim_ioctl;
 static d_open_t		g_nandsim_open;
-static d_close_t	g_nandsim_close;
+static d_read_t		g_nandsim_read;
 static d_strategy_t	g_nandsim_strategy;
-static d_ioctl_t	g_nandsim_ioctl;
+static d_write_t	g_nandsim_write;
 
 static struct cdevsw g_nandsim_cdevsw = {
 	.d_version =	D_VERSION,
-	.d_open =	g_nandsim_open,
 	.d_close =	g_nandsim_close,
-	.d_read =	physread,
-	.d_write =	physwrite,
 	.d_ioctl =	g_nandsim_ioctl,
+	.d_open =	g_nandsim_open,
+	.d_read =	g_nandsim_read,
 	.d_strategy =	g_nandsim_strategy,
+	.d_write =	g_nandsim_write,
 	.d_name =	"g_nandsim",
-	.d_flags =	D_DISK | D_TRACKCLOSE,
+	.d_flags =	D_TRACKCLOSE,
 };
 
 static g_access_t	g_nandsim_access;
@@ -112,7 +116,7 @@
 g_nandsim_access(struct g_provider *pp, int r, int w, int e)
 {
 
-	return (ENOSYS);
+	return (0);
 }
 
 static void
@@ -158,22 +162,37 @@
 }
 
 static int
+g_nandsim_read(struct cdev *dev, struct uio *uio, int ioflag)
+{
+
+	if (dev->si_drv1 == NANDSIMCTL)
+		return (ENODEV);
+
+	return (EDOOFUS);
+}
+
+static int
+g_nandsim_write(struct cdev *dev, struct uio *uio, int ioflag)
+{
+
+	if (dev->si_drv1 == NANDSIMCTL)
+		return (ENODEV);
+
+	return (EDOOFUS);
+}
+
+static int
 g_nandsim_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
     struct thread *td)
 {
-	int i, error;
 
 	if (dev->si_drv1 != NANDSIMCTL)
 		return (ENOIOCTL);
 
-	i = IOCPARM_LEN(cmd);
-	switch (cmd) {
-	default:
-		error = ENOIOCTL;
-		break;
-	}
+	if (cmd != NANDSIM_CREATE)
+		return (ENOIOCTL);
 
-	return (error);
+	return (EDOOFUS);
 }
 
 static void
@@ -209,6 +228,13 @@
 	        bp->bio_cmd == BIO_DELETE,
 		("Wrong bio_cmd bio=%p cmd=%d", bp, bp->bio_cmd));
 	dev = bp->bio_dev;
+
+	if (dev->si_drv1 == NANDSIMCTL) {
+		bp->bio_resid = bp->bio_bcount;
+		biofinish(bp, NULL, ENODEV);
+		return;
+	}
+
 	cp = dev->si_drv2;
 
 	if ((bp->bio_offset % cp->provider->sectorsize) != 0 ||

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 04:52:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 73EED106566C; Mon, 30 Mar 2009 04:52:58 +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 318C1106564A
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:52:58 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A7B28FC15
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:52:58 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U4qvBn015183
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 04:52:57 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U4qveh015181
	for perforce@freebsd.org; Mon, 30 Mar 2009 04:52:57 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 30 Mar 2009 04:52:57 GMT
Message-Id: <200903300452.n2U4qveh015181@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 159988 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: Mon, 30 Mar 2009 04:52:59 -0000

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

Change 159988 by scottl@scottl-deimos on 2009/03/30 04:52:03

	Get CAM back in sync with HEAD so that it can be worked on again.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#79 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#38 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#14 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#4 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $
+ * $FreeBSD: src/sys/cam/cam.h,v 1.12 2008/09/18 14:48:46 sbruno Exp $
  */
 
 #ifndef _CAM_CAM_H
@@ -129,6 +129,7 @@
 				 * requests for the target at the sim level
 				 * back into the XPT queue.
 				 */
+	CAM_SCSI_IT_NEXUS_LOST,	/* Initiator/Target Nexus lost. */
 	CAM_IDE = 0x33,		/* Initiator Detected Error */
 	CAM_RESRC_UNAVAIL,	/* Resource Unavailable */
 	CAM_UNACKED_EVENT,	/* Unacknowledged Event by Host */

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#25 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.70 2008/02/12 11:07:33 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.77 2009/02/09 17:02:54 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -171,6 +171,10 @@
 			break;
 	}
 	xpt_unlock_buses();
+	if (*p_drv == NULL) {
+		printf("cam_periph_alloc: invalid periph name '%s'\n", name);
+		return (CAM_REQ_INVALID);
+	}
 
 	sim = xpt_path_sim(path);
 	path_id = xpt_path_path_id(path);
@@ -290,7 +294,7 @@
 }
 
 void
-cam_periph_release(struct cam_periph *periph)
+cam_periph_release_locked(struct cam_periph *periph)
 {
 
 	if (periph == NULL)
@@ -302,17 +306,28 @@
 		camperiphfree(periph);
 	}
 	xpt_unlock_buses();
+}
+
+void
+cam_periph_release(struct cam_periph *periph)
+{
+	struct cam_sim *sim;
 
+	if (periph == NULL)
+		return;
+	
+	sim = periph->sim;
+	mtx_assert(sim->mtx, MA_NOTOWNED);
+	mtx_lock(sim->mtx);
+	cam_periph_release_locked(periph);
+	mtx_unlock(sim->mtx);
 }
 
 int
 cam_periph_hold(struct cam_periph *periph, int priority)
 {
-	struct mtx *mtx;
 	int error;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
-
 	/*
 	 * Increment the reference count on the peripheral
 	 * while we wait for our lock attempt to succeed
@@ -323,14 +338,12 @@
 	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
 		return (ENXIO);
 
-	mtx = periph->sim->mtx;
-	if (mtx == &Giant)
-		mtx = NULL;
-
+	mtx_assert(periph->sim->mtx, MA_OWNED);
 	while ((periph->flags & CAM_PERIPH_LOCKED) != 0) {
 		periph->flags |= CAM_PERIPH_LOCK_WANTED;
-		if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) {
-			cam_periph_release(periph);
+		if ((error = mtx_sleep(periph, periph->sim->mtx, priority,
+		    "caplck", 0)) != 0) {
+			cam_periph_release_locked(periph);
 			return (error);
 		}
 	}
@@ -351,7 +364,7 @@
 		wakeup(periph);
 	}
 
-	cam_periph_release(periph);
+	cam_periph_release_locked(periph);
 }
 
 /*
@@ -750,7 +763,6 @@
 cam_periph_getccb(struct cam_periph *periph, u_int32_t priority)
 {
 	struct ccb_hdr *ccb_h;
-	struct mtx *mtx;
 
 	mtx_assert(periph->sim->mtx, MA_OWNED);
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n"));
@@ -763,11 +775,8 @@
 		 && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority))
 			break;
 		mtx_assert(periph->sim->mtx, MA_OWNED);
-		if (periph->sim->mtx == &Giant)
-			mtx = NULL;
-		else
-			mtx = periph->sim->mtx;
-		msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0);
+		mtx_sleep(&periph->ccb_list, periph->sim->mtx, PRIBIO, "cgticb",
+		    0);
 	}
 
 	ccb_h = SLIST_FIRST(&periph->ccb_list);
@@ -778,17 +787,12 @@
 void
 cam_periph_ccbwait(union ccb *ccb)
 {
-	struct mtx *mtx;
 	struct cam_sim *sim;
 
 	sim = xpt_path_sim(ccb->ccb_h.path);
-	if (sim->mtx == &Giant)
-		mtx = NULL;
-	else
-		mtx = sim->mtx;
 	if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX)
 	 || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG))
-		msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0);
+		mtx_sleep(&ccb->ccb_h.cbfcnp, sim->mtx, PRIBIO, "cbwait", 0);
 }
 
 int

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#15 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam_periph.h,v 1.18 2007/04/19 22:46:26 scottl Exp $
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.19 2008/12/19 14:31:40 trasz Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
@@ -141,6 +141,7 @@
 struct cam_periph *cam_periph_find(struct cam_path *path, char *name);
 cam_status	cam_periph_acquire(struct cam_periph *periph);
 void		cam_periph_release(struct cam_periph *periph);
+void		cam_periph_release_locked(struct cam_periph *periph);
 int		cam_periph_hold(struct cam_periph *periph, int priority);
 void		cam_periph_unhold(struct cam_periph *periph);
 void		cam_periph_invalidate(struct cam_periph *periph);

==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#12 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.13 2008/12/19 14:33:29 trasz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -84,6 +84,7 @@
 	sim->max_tagged_dev_openings = max_tagged_dev_transactions;
 	sim->max_dev_openings = max_dev_transactions;
 	sim->flags = 0;
+	sim->refcount = 1;
 	sim->devq = queue;
 	sim->mtx = mtx;
 	if (mtx == &Giant) {
@@ -103,12 +104,42 @@
 void
 cam_sim_free(struct cam_sim *sim, int free_devq)
 {
+	int error;
+
+	sim->refcount--;
+	if (sim->refcount > 0) {
+		error = msleep(sim, sim->mtx, PRIBIO, "simfree", 0);
+		KASSERT(error == 0, ("invalid error value for msleep(9)"));
+	}
+
+	KASSERT(sim->refcount == 0, ("sim->refcount == 0"));
+
 	if (free_devq)
 		cam_simq_free(sim->devq);
 	free(sim, M_CAMSIM);
 }
 
 void
+cam_sim_release(struct cam_sim *sim)
+{
+	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
+	mtx_assert(sim->mtx, MA_OWNED);
+
+	sim->refcount--;
+	if (sim->refcount == 0)
+		wakeup(sim);
+}
+
+void
+cam_sim_hold(struct cam_sim *sim)
+{
+	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
+	mtx_assert(sim->mtx, MA_OWNED);
+
+	sim->refcount++;
+}
+
+void
 cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id)
 {
 	sim->path_id = path_id;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#11 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $
+ * $FreeBSD: src/sys/cam/cam_sim.h,v 1.10 2008/12/22 16:58:47 scottl Exp $
  */
 
 #ifndef _CAM_CAM_SIM_H
@@ -61,6 +61,8 @@
 				int max_tagged_dev_transactions,
 				struct cam_devq *queue);
 void		  cam_sim_free(struct cam_sim *sim, int free_devq);
+void		  cam_sim_hold(struct cam_sim *sim);
+void		  cam_sim_release(struct cam_sim *sim);
 
 /* Optional sim attributes may be set with these. */
 void	cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id);
@@ -105,8 +107,9 @@
 #define CAM_SIM_ON_DONEQ		0x04
 	struct callout		callout;
 	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
+	int			refcount; /* References to the SIM. */
 
-	/* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */
+	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
 	SLIST_HEAD(,ccb_hdr)	ccb_freeq;
 	/*
 	 * Maximum size of ccb pool.  Modified as devices are added/removed

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#79 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.196 2008/02/26 08:09:29 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.213 2009/02/16 18:02:32 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/module.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
@@ -66,7 +65,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
-#include <cam/scsi/scsi_xpt.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"
 
@@ -92,6 +90,9 @@
 	void		*callback_arg;
 };
 
+SLIST_HEAD(async_list, async_node);
+SLIST_HEAD(periph_list, cam_periph);
+
 /*
  * This is the maximum number of high powered commands (e.g. start unit)
  * that can be outstanding at a particular time.
@@ -100,6 +101,148 @@
 #define CAM_MAX_HIGHPOWER  4
 #endif
 
+/*
+ * Structure for queueing a device in a run queue.
+ * There is one run queue for allocating new ccbs,
+ * and another for sending ccbs to the controller.
+ */
+struct cam_ed_qinfo {
+	cam_pinfo pinfo;
+	struct	  cam_ed *device;
+};
+
+/*
+ * The CAM EDT (Existing Device Table) contains the device information for
+ * all devices for all busses in the system.  The table contains a
+ * cam_ed structure for each device on the bus.
+ */
+struct cam_ed {
+	TAILQ_ENTRY(cam_ed) links;
+	struct	cam_ed_qinfo alloc_ccb_entry;
+	struct	cam_ed_qinfo send_ccb_entry;
+	struct	cam_et	 *target;
+	struct	cam_sim  *sim;
+	lun_id_t	 lun_id;
+	struct	camq drvq;		/*
+					 * Queue of type drivers wanting to do
+					 * work on this device.
+					 */
+	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
+	struct	async_list asyncs;	/* Async callback info for this B/T/L */
+	struct	periph_list periphs;	/* All attached devices */
+	u_int	generation;		/* Generation number */
+	struct	cam_periph *owner;	/* Peripheral driver's ownership tag */
+	struct	xpt_quirk_entry *quirk;	/* Oddities about this device */
+					/* Storage for the inquiry data */
+	cam_proto	 protocol;
+	u_int		 protocol_version;
+	cam_xport	 transport;
+	u_int		 transport_version;
+	struct		 scsi_inquiry_data inq_data;
+	u_int8_t	 inq_flags;	/*
+					 * Current settings for inquiry flags.
+					 * This allows us to override settings
+					 * like disconnection and tagged
+					 * queuing for a device.
+					 */
+	u_int8_t	 queue_flags;	/* Queue flags from the control page */
+	u_int8_t	 serial_num_len;
+	u_int8_t	*serial_num;
+	u_int32_t	 qfrozen_cnt;
+	u_int32_t	 flags;
+#define CAM_DEV_UNCONFIGURED	 	0x01
+#define CAM_DEV_REL_TIMEOUT_PENDING	0x02
+#define CAM_DEV_REL_ON_COMPLETE		0x04
+#define CAM_DEV_REL_ON_QUEUE_EMPTY	0x08
+#define CAM_DEV_RESIZE_QUEUE_NEEDED	0x10
+#define CAM_DEV_TAG_AFTER_COUNT		0x20
+#define CAM_DEV_INQUIRY_DATA_VALID	0x40
+#define	CAM_DEV_IN_DV			0x80
+#define	CAM_DEV_DV_HIT_BOTTOM		0x100
+	u_int32_t	 tag_delay_count;
+#define	CAM_TAG_DELAY_COUNT		5
+	u_int32_t	 tag_saved_openings;
+	u_int32_t	 refcount;
+	struct callout	 callout;
+};
+
+/*
+ * Each target is represented by an ET (Existing Target).  These
+ * entries are created when a target is successfully probed with an
+ * identify, and removed when a device fails to respond after a number
+ * of retries, or a bus rescan finds the device missing.
+ */
+struct cam_et {
+	TAILQ_HEAD(, cam_ed) ed_entries;
+	TAILQ_ENTRY(cam_et) links;
+	struct	cam_eb	*bus;
+	target_id_t	target_id;
+	u_int32_t	refcount;
+	u_int		generation;
+	struct		timeval last_reset;
+};
+
+/*
+ * Each bus is represented by an EB (Existing Bus).  These entries
+ * are created by calls to xpt_bus_register and deleted by calls to
+ * xpt_bus_deregister.
+ */
+struct cam_eb {
+	TAILQ_HEAD(, cam_et) et_entries;
+	TAILQ_ENTRY(cam_eb)  links;
+	path_id_t	     path_id;
+	struct cam_sim	     *sim;
+	struct timeval	     last_reset;
+	u_int32_t	     flags;
+#define	CAM_EB_RUNQ_SCHEDULED	0x01
+	u_int32_t	     refcount;
+	u_int		     generation;
+	device_t	     parent_dev;
+};
+
+struct cam_path {
+	struct cam_periph *periph;
+	struct cam_eb	  *bus;
+	struct cam_et	  *target;
+	struct cam_ed	  *device;
+};
+
+struct xpt_quirk_entry {
+	struct scsi_inquiry_pattern inq_pat;
+	u_int8_t quirks;
+#define	CAM_QUIRK_NOLUNS	0x01
+#define	CAM_QUIRK_NOSERIAL	0x02
+#define	CAM_QUIRK_HILUNS	0x04
+#define	CAM_QUIRK_NOHILUNS	0x08
+	u_int mintags;
+	u_int maxtags;
+};
+
+static int cam_srch_hi = 0;
+TUNABLE_INT("kern.cam.cam_srch_hi", &cam_srch_hi);
+static int sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_kern_cam, OID_AUTO, cam_srch_hi, CTLTYPE_INT|CTLFLAG_RW, 0, 0,
+    sysctl_cam_search_luns, "I",
+    "allow search above LUN 7 for SCSI3 and greater devices");
+
+#define	CAM_SCSI2_MAXLUN	8
+/*
+ * If we're not quirked to search <= the first 8 luns
+ * and we are either quirked to search above lun 8,
+ * or we're > SCSI-2 and we've enabled hilun searching,
+ * or we're > SCSI-2 and the last lun was a success,
+ * we can look for luns above lun 8.
+ */
+#define	CAN_SRCH_HI_SPARSE(dv)				\
+  (((dv->quirk->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
+  && ((dv->quirk->quirks & CAM_QUIRK_HILUNS)		\
+  || (SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2 && cam_srch_hi)))
+
+#define	CAN_SRCH_HI_DENSE(dv)				\
+  (((dv->quirk->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
+  && ((dv->quirk->quirks & CAM_QUIRK_HILUNS)		\
+  || (SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2)))
+
 typedef enum {
 	XPT_FLAG_OPEN		= 0x01
 } xpt_flags;
@@ -125,6 +268,359 @@
 	struct mtx		xpt_lock;
 };
 
+static const char quantum[] = "QUANTUM";
+static const char sony[] = "SONY";
+static const char west_digital[] = "WDIGTL";
+static const char samsung[] = "SAMSUNG";
+static const char seagate[] = "SEAGATE";
+static const char microp[] = "MICROP";
+
+static struct xpt_quirk_entry xpt_quirk_table[] =
+{
+	{
+		/* Reports QUEUE FULL for temporary resource shortages */
+		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP39100*", "*" },
+		/*quirks*/0, /*mintags*/24, /*maxtags*/32
+	},
+	{
+		/* Reports QUEUE FULL for temporary resource shortages */
+		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP34550*", "*" },
+		/*quirks*/0, /*mintags*/24, /*maxtags*/32
+	},
+	{
+		/* Reports QUEUE FULL for temporary resource shortages */
+		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP32275*", "*" },
+		/*quirks*/0, /*mintags*/24, /*maxtags*/32
+	},
+	{
+		/* Broken tagged queuing drive */
+		{ T_DIRECT, SIP_MEDIA_FIXED, microp, "4421-07*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Broken tagged queuing drive */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "HP", "C372*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Broken tagged queuing drive */
+		{ T_DIRECT, SIP_MEDIA_FIXED, microp, "3391*", "x43h" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * Unfortunately, the Quantum Atlas III has the same
+		 * problem as the Atlas II drives above.
+		 * Reported by: "Johan Granlund" <johan@granlund.nu>
+		 *
+		 * For future reference, the drive with the problem was:
+		 * QUANTUM QM39100TD-SW N1B0
+		 *
+		 * It's possible that Quantum will fix the problem in later
+		 * firmware revisions.  If that happens, the quirk entry
+		 * will need to be made specific to the firmware revisions
+		 * with the problem.
+		 *
+		 */
+		/* Reports QUEUE FULL for temporary resource shortages */
+		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM39100*", "*" },
+		/*quirks*/0, /*mintags*/24, /*maxtags*/32
+	},
+	{
+		/*
+		 * 18 Gig Atlas III, same problem as the 9G version.
+		 * Reported by: Andre Albsmeier
+		 *		<andre.albsmeier@mchp.siemens.de>
+		 *
+		 * For future reference, the drive with the problem was:
+		 * QUANTUM QM318000TD-S N491
+		 */
+		/* Reports QUEUE FULL for temporary resource shortages */
+		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM318000*", "*" },
+		/*quirks*/0, /*mintags*/24, /*maxtags*/32
+	},
+	{
+		/*
+		 * Broken tagged queuing drive
+		 * Reported by: Bret Ford <bford@uop.cs.uop.edu>
+		 *         and: Martin Renters <martin@tdc.on.ca>
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST410800*", "71*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+		/*
+		 * The Seagate Medalist Pro drives have very poor write
+		 * performance with anything more than 2 tags.
+		 *
+		 * Reported by:  Paul van der Zwan <paulz@trantor.xs4all.nl>
+		 * Drive:  <SEAGATE ST36530N 1444>
+		 *
+		 * Reported by:  Jeremy Lea <reg@shale.csir.co.za>
+		 * Drive:  <SEAGATE ST34520W 1281>
+		 *
+		 * No one has actually reported that the 9G version
+		 * (ST39140*) of the Medalist Pro has the same problem, but
+		 * we're assuming that it does because the 4G and 6.5G
+		 * versions of the drive are broken.
+		 */
+	{
+		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST34520*", "*"},
+		/*quirks*/0, /*mintags*/2, /*maxtags*/2
+	},
+	{
+		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST36530*", "*"},
+		/*quirks*/0, /*mintags*/2, /*maxtags*/2
+	},
+	{
+		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST39140*", "*"},
+		/*quirks*/0, /*mintags*/2, /*maxtags*/2
+	},
+	{
+		/*
+		 * Slow when tagged queueing is enabled.  Write performance
+		 * steadily drops off with more and more concurrent
+		 * transactions.  Best sequential write performance with
+		 * tagged queueing turned off and write caching turned on.
+		 *
+		 * PR:  kern/10398
+		 * Submitted by:  Hideaki Okada <hokada@isl.melco.co.jp>
+		 * Drive:  DCAS-34330 w/ "S65A" firmware.
+		 *
+		 * The drive with the problem had the "S65A" firmware
+		 * revision, and has also been reported (by Stephen J.
+		 * Roznowski <sjr@home.net>) for a drive with the "S61A"
+		 * firmware revision.
+		 *
+		 * Although no one has reported problems with the 2 gig
+		 * version of the DCAS drive, the assumption is that it
+		 * has the same problems as the 4 gig version.  Therefore
+		 * this quirk entries disables tagged queueing for all
+		 * DCAS drives.
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "IBM", "DCAS*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Broken tagged queuing drive */
+		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "iomega", "jaz*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Broken tagged queuing drive */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "CONNER", "CFP2107*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* This does not support other than LUN 0 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255
+	},
+	{
+		/*
+		 * Broken tagged queuing drive.
+		 * Submitted by:
+		 * NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
+		 * in PR kern/9535
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, samsung, "WN34324U*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+	},
+        {
+		/*
+		 * Slow when tagged queueing is enabled. (1.5MB/sec versus
+		 * 8MB/sec.)
+		 * Submitted by: Andrew Gallatin <gallatin@cs.duke.edu>
+		 * Best performance with these drives is achieved with
+		 * tagged queueing turned off, and write caching turned on.
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, west_digital, "WDE*", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+        },
+        {
+		/*
+		 * Slow when tagged queueing is enabled. (1.5MB/sec versus
+		 * 8MB/sec.)
+		 * Submitted by: Andrew Gallatin <gallatin@cs.duke.edu>
+		 * Best performance with these drives is achieved with
+		 * tagged queueing turned off, and write caching turned on.
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, west_digital, "ENTERPRISE", "*" },
+		/*quirks*/0, /*mintags*/0, /*maxtags*/0
+        },
+	{
+		/*
+		 * Doesn't handle queue full condition correctly,
+		 * so we need to limit maxtags to what the device
+		 * can handle instead of determining this automatically.
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, samsung, "WN321010S*", "*" },
+		/*quirks*/0, /*mintags*/2, /*maxtags*/32
+	},
+	{
+		/* Really only one LUN */
+		{ T_ENCLOSURE, SIP_MEDIA_FIXED, "SUN", "SENA", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* I can't believe we need a quirk for DPT volumes. */
+		{ T_ANY, SIP_MEDIA_FIXED|SIP_MEDIA_REMOVABLE, "DPT", "*", "*" },
+		CAM_QUIRK_NOLUNS,
+		/*mintags*/0, /*maxtags*/255
+	},
+	{
+		/*
+		 * Many Sony CDROM drives don't like multi-LUN probing.
+		 */
+		{ T_CDROM, SIP_MEDIA_REMOVABLE, sony, "CD-ROM CDU*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * This drive doesn't like multiple LUN probing.
+		 * Submitted by:  Parag Patel <parag@cgt.com>
+		 */
+		{ T_WORM, SIP_MEDIA_REMOVABLE, sony, "CD-R   CDU9*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		{ T_WORM, SIP_MEDIA_REMOVABLE, "YAMAHA", "CDR100*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * The 8200 doesn't like multi-lun probing, and probably
+		 * don't like serial number requests either.
+		 */
+		{
+			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE",
+			"EXB-8200*", "*"
+		},
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * Let's try the same as above, but for a drive that says
+		 * it's an IPL-6860 but is actually an EXB 8200.
+		 */
+		{
+			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE",
+			"IPL-6860*", "*"
+		},
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * These Hitachi drives don't like multi-lun probing.
+		 * The PR submitter has a DK319H, but says that the Linux
+		 * kernel has a similar work-around for the DK312 and DK314,
+		 * so all DK31* drives are quirked here.
+		 * PR:            misc/18793
+		 * Submitted by:  Paul Haddad <paul@pth.com>
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "DK31*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255
+	},
+	{
+		/*
+		 * The Hitachi CJ series with J8A8 firmware apparantly has
+		 * problems with tagged commands.
+		 * PR: 23536
+		 * Reported by: amagai@nue.org
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "DK32CJ*", "J8A8" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * These are the large storage arrays.
+		 * Submitted by:  William Carrel <william.carrel@infospace.com>
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "OPEN*", "*" },
+		CAM_QUIRK_HILUNS, 2, 1024
+	},
+	{
+		/*
+		 * This old revision of the TDC3600 is also SCSI-1, and
+		 * hangs upon serial number probing.
+		 */
+		{
+			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "TANDBERG",
+			" TDC 3600", "U07:"
+		},
+		CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * Would repond to all LUNs if asked for.
+		 */
+		{
+			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "CALIPER",
+			"CP150", "*"
+		},
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/*
+		 * Would repond to all LUNs if asked for.
+		 */
+		{
+			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "KENNEDY",
+			"96X2*", "*"
+		},
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Submitted by: Matthew Dodd <winter@jurai.net> */
+		{ T_PROCESSOR, SIP_MEDIA_FIXED, "Cabletrn", "EA41*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Submitted by: Matthew Dodd <winter@jurai.net> */
+		{ T_PROCESSOR, SIP_MEDIA_FIXED, "CABLETRN", "EA41*", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* TeraSolutions special settings for TRC-22 RAID */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "TERASOLU", "TRC-22", "*" },
+		  /*quirks*/0, /*mintags*/55, /*maxtags*/255
+	},
+	{
+		/* Veritas Storage Appliance */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "VERITAS", "*", "*" },
+		  CAM_QUIRK_HILUNS, /*mintags*/2, /*maxtags*/1024
+	},
+	{
+		/*
+		 * Would respond to all LUNs.  Device type and removable
+		 * flag are jumper-selectable.
+		 */
+		{ T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, "MaxOptix",
+		  "Tahiti 1", "*"
+		},
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* EasyRAID E5A aka. areca ARC-6010 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "easyRAID", "*", "*" },
+		  CAM_QUIRK_NOHILUNS, /*mintags*/2, /*maxtags*/255
+	},
+	{
+		{ T_ENCLOSURE, SIP_MEDIA_FIXED, "DP", "BACKPLANE", "*" },
+		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
+	},
+	{
+		/* Default tagged queuing parameters for all devices */
+		{
+		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
+		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
+		},
+		/*quirks*/0, /*mintags*/2, /*maxtags*/255
+	},
+};
+
+static const int xpt_quirk_table_size =
+	sizeof(xpt_quirk_table) / sizeof(*xpt_quirk_table);
+
 typedef enum {
 	DM_RET_COPY		= 0x01,
 	DM_RET_FLAG_MASK	= 0x0f,
@@ -170,13 +666,22 @@
 
 static periph_init_t xpt_periph_init;
 
-static struct periph_driver xpt_periph_driver =
+static periph_init_t probe_periph_init;
+
+static struct periph_driver xpt_driver =
 {
 	xpt_periph_init, "xpt",
-	TAILQ_HEAD_INITIALIZER(xpt_periph_driver.units)
+	TAILQ_HEAD_INITIALIZER(xpt_driver.units)
+};
+
+static struct periph_driver probe_driver =
+{
+	probe_periph_init, "probe",
+	TAILQ_HEAD_INITIALIZER(probe_driver.units)
 };
 
-PERIPHDRIVER_DECLARE(xpt, xpt_periph_driver);
+PERIPHDRIVER_DECLARE(xpt, xpt_driver);
+PERIPHDRIVER_DECLARE(probe, probe_driver);
 
 
 static d_open_t xptopen;
@@ -193,19 +698,6 @@
 };
 
 
-static void dead_sim_action(struct cam_sim *sim, union ccb *ccb);
-static void dead_sim_poll(struct cam_sim *sim);
-
-/* Dummy SIM that is used when the real one has gone. */
-static struct cam_sim cam_dead_sim = {
-	.sim_action =	dead_sim_action,
-	.sim_poll =	dead_sim_poll,
-	.sim_name =	"dead_sim",
-};
-
-#define SIM_DEAD(sim)	((sim) == &cam_dead_sim)
-
-
 /* Storage for debugging datastructures */
 #ifdef	CAMDEBUG
 struct cam_path *cam_dpath;
@@ -235,27 +727,28 @@
 #endif /* CAMDEBUG */
 #endif /* CAM_DEBUG_BUS || CAM_DEBUG_TARGET || CAM_DEBUG_LUN */
 
-static void	xpt_identify(driver_t *driver, device_t parent);
-static int	xpt_probe(device_t dev);
-static int	xpt_attach(device_t dev);
-static int	xpt_detach(device_t dev);
+/* Our boot-time initialization hook */
+static int cam_module_event_handler(module_t, int /*modeventtype_t*/, void *);
 
-static device_method_t xpt_sim_methods[] = {
-	DEVMETHOD(device_identify,	xpt_identify),
-	DEVMETHOD(device_probe,		xpt_probe),
-	DEVMETHOD(device_attach,	xpt_attach),
-	DEVMETHOD(device_detach,	xpt_detach),
-	{ 0, 0 }
+static moduledata_t cam_moduledata = {
+	"cam",
+	cam_module_event_handler,
+	NULL
 };
 
-static driver_t xpt_sim_driver = {
-	"xptsim",
-	xpt_sim_methods,
-	1,	/* XXX Need softc */
-};
+static int	xpt_init(void *);
+
+DECLARE_MODULE(cam, cam_moduledata, SI_SUB_CONFIGURE, SI_ORDER_SECOND);
+MODULE_VERSION(cam, 1);
+
+
+static cam_status	xpt_compile_path(struct cam_path *new_path,
+					 struct cam_periph *perph,
+					 path_id_t path_id,
+					 target_id_t target_id,
+					 lun_id_t lun_id);
 
-static devclass_t xpt_devclass;
-DRIVER_MODULE(xpt, nexus, xpt_sim_driver, xpt_devclass, 0, 0);
+static void		xpt_release_path(struct cam_path *path);
 
 static void		xpt_async_bcast(struct async_list *async_head,
 					u_int32_t async_code,
@@ -293,6 +786,11 @@
 		 xpt_find_target(struct cam_eb *bus, target_id_t target_id);
 static struct cam_ed*
 		 xpt_find_device(struct cam_et *target, lun_id_t lun_id);
+static void	 xpt_scan_bus(struct cam_periph *periph, union ccb *ccb);
+static void	 xpt_scan_lun(struct cam_periph *periph,
+			      struct cam_path *path, cam_flags flags,
+			      union ccb *ccb);
+static void	 xptscandone(struct cam_periph *periph, union ccb *done_ccb);
 static xpt_busfunc_t	xptconfigbuscountfunc;
 static xpt_busfunc_t	xptconfigfunc;
 static void	 xpt_config(void *arg);
@@ -346,6 +844,17 @@
 static xpt_busfunc_t	xptsetasyncbusfunc;
 static cam_status	xptregister(struct cam_periph *periph,
 				    void *arg);
+static cam_status	proberegister(struct cam_periph *periph,
+				      void *arg);
+static void	 probeschedule(struct cam_periph *probe_periph);
+static void	 probestart(struct cam_periph *periph, union ccb *start_ccb);
+static void	 proberequestdefaultnegotiation(struct cam_periph *periph);
+static int       proberequestbackoff(struct cam_periph *periph,
+				     struct cam_ed *device);
+static void	 probedone(struct cam_periph *periph, union ccb *done_ccb);
+static void	 probecleanup(struct cam_periph *periph);
+static void	 xpt_find_quirk(struct cam_ed *device);
+static void	 xpt_devise_transport(struct cam_path *path);
 static void	 xpt_set_transfer_settings(struct ccb_trans_settings *cts,
 					   struct cam_ed *device,
 					   int async_update);
@@ -379,7 +888,7 @@
 		 */
 		retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue,
 					  &dev->alloc_ccb_entry.pinfo,
-					  CAMQ_GET_HEAD(&dev->drvq)->priority);	
+					  CAMQ_GET_HEAD(&dev->drvq)->priority);
 	} else {
 		retval = 0;
 	}
@@ -446,6 +955,12 @@
 }
 
 static void
+probe_periph_init()
+{
+}
+
+
+static void
 xptdone(struct cam_periph *periph, union ccb *done_ccb)
 {
 	/* Caller will release the CCB */
@@ -474,7 +989,7 @@
 	mtx_lock(&xsoftc.xpt_lock);
 	xsoftc.flags |= XPT_FLAG_OPEN;
 	mtx_unlock(&xsoftc.xpt_lock);
-	
+
 	return(0);
 }
 
@@ -675,7 +1190,7 @@
 	 * (or rather should be) impossible for the device peripheral driver
 	 * list to change since we look at the whole thing in one pass, and
 	 * we do it with lock protection.
-	 * 

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

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 05:38:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 15F121065673; Mon, 30 Mar 2009 05:38:11 +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 C5C3F106564A
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 05:38:10 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B1B1A8FC29
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 05:38:10 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U5cAH3019536
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 05:38:10 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U5bhOa019506
	for perforce@freebsd.org; Mon, 30 Mar 2009 05:37:43 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 30 Mar 2009 05:37:43 GMT
Message-Id: <200903300537.n2U5bhOa019506@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 159990 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: Mon, 30 Mar 2009 05:38:12 -0000

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

Change 159990 by scottl@scottl-deimos on 2009/03/30 05:37:08

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/Makefile#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_switch.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakecode.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/genwakecode.sh#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/genwakedata.sh#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64_mem.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_disasm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/dump_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/minidump_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/prof_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/tsc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#19 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/cputypes.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/elf.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/fpu.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/iodev.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/legacyvar.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/memdev.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb_ext.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pci_cfgreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/segments.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/stack.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/hypercall.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/synch_bitops.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xen-os.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xenfunc.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xenpmap.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xenvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_genassym.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_locore.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/arm/db_interface.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/dump_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/exception.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/minidump_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/swtch.S#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mcireg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pdcreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pio.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pioreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_piovar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmcreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmcvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtcreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spireg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_ssc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_sscreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_streg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twiio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twireg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_usartreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91board.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/board_bwct.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/board_hl200.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/board_kb920x.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/board_tsc4370.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/files.kb920x#2 delete
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_atereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#12 delete
.. //depot/projects/scottl-camlock/src/sys/arm/at91/ohci_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/std.at91#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/std.bwct#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/std.hl200#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/std.kb920x#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/std.tsc4370#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA.hints#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA.hints#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX.hints#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU.hints#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/db_machdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/endian.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/ieee.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/intr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/machdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/memdev.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/metadata.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/minidump.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/pcpu.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/proc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/resource.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/sysarch.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_pci.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/files.sa11x0#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_io.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ost.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.ep80219#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.i80219#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.i80321#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/obio_space.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_ata.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npereg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npevar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/std.avila#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/std.ixp435#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/files.pxa#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/if_smc_smi.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_gpio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_icu.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_obio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_smi.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_space.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_timer.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxareg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxavar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/std.pxa#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile.inc#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/kb920x_board.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/devopen.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/interp.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/load.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#14 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/misc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/ufsread.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/efi/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ficl/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ficl/mips/sysdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/ficl/mips/sysdep.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.4th#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#15 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/pnp.4th#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/support.4th#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot1.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/btx.S#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptzfsboot/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bioscd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biossmap.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo32.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/time.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/conf.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeboot.8#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/common/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/ski/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ofw/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_console.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_disk.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/README.serial.98#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/bioscd.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/time.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/conf.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/metadata.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/start.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/locore.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/metadata.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/console.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/devicename.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/disk.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/libuboot.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/net.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/reboot.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/time.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_domain.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_errno.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_socket_type.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/README#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/fletcher.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/lzjb.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/sha256.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/file.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sema.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sid.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sig.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/cyclic.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/cyclic_test.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtmalloc/dtmalloc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/fbt/fbt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/profile/profile.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/prototype.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/sdt/sdt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/systrace/systrace.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_signal.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#16 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_getcwd.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/hal_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/pe_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/resource_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/usbd_var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/winx32_wrap.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.c#6 delete
.. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysvec.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_types.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#12 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.mips#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#25 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#27 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.arm#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.mips#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#14 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#15 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#6 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#9 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#14 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#11 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.cfe#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#7 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#22 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#9 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.arm#15 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.i386#10 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.ia64#5 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.mips#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#11 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.sparc64#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cbq.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cdnr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_priq.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_red.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rio.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/COPYRIGHT#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/README#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah.h#6 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_desc.h#6 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_devid.h#6 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/ah_soc.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.inc#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.inc#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.inc#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.inc#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/wackelf.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.inc#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#5 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/version.h#6 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/COPYRIGHT#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr.c#8 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr_isa.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr_pci.c#4 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltrvar.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/trlld.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/trlldbm.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/trlldhm.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/trlldmac.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_subr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_table.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/crypto/rc4/rc4.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock_hash.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_expr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_main.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_run.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_textdump.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_fujitsu.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_sony.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSynch.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirk.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_aereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_aevar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_agereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_agevar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_amd64.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_intel.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_via.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agppriv.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agpreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_isa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aha/aha_mca.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_alereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_alevar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/amdtemp/amdtemp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#5 integrate

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

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 06:45:19 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32CFD106566C; Mon, 30 Mar 2009 06:45:19 +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 D9981106564A
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:45:18 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C7B028FC19
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:45:18 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U6jIex025541
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:45:18 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U6jI3m025539
	for perforce@freebsd.org; Mon, 30 Mar 2009 06:45:18 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 30 Mar 2009 06:45:18 GMT
Message-Id: <200903300645.n2U6jI3m025539@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159992 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: Mon, 30 Mar 2009 06:45:20 -0000

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

Change 159992 by hselasky@hselasky_laptop001 on 2009/03/30 06:45:12

	
	First patch from Sylvestra Gallon:
	- at91_udp.c does not exist anymore, it is now replaced by at91dci
	in src/sys/dev/usb/controller. I have also removed the
	ohci_atmelarm.c because it is also included in src/sys/conf/files

Affected files ...

.. //depot/projects/usb/src/sys/arm/at91/files.at91#8 edit

Differences ...

==== //depot/projects/usb/src/sys/arm/at91/files.at91#8 (text) ====

@@ -13,12 +13,10 @@
 	dependency	"spibus_if.h"
 arm/at91/at91_tc.c		optional	at91_tc
 arm/at91/at91_twi.c		optional	at91_twi
-arm/at91/at91_udp.c		optional	at91_udp
 arm/at91/if_ate.c		optional	ate
 arm/at91/uart_bus_at91usart.c	optional	uart
 arm/at91/uart_cpu_at91rm9200usart.c	optional	uart
 arm/at91/uart_dev_at91usart.c	optional	uart
-dev/usb/controller/ohci_atmelarm.c	optional	ohci
 #
 # All the boards we support
 #

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 06:50:24 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 779F01065688; Mon, 30 Mar 2009 06:50:24 +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 283BC1065686
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:50:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 15C4E8FC20
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:50:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U6oNpT025964
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 06:50:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U6oNMD025962
	for perforce@freebsd.org; Mon, 30 Mar 2009 06:50:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 30 Mar 2009 06:50:23 GMT
Message-Id: <200903300650.n2U6oNMD025962@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159993 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: Mon, 30 Mar 2009 06:50:26 -0000

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

Change 159993 by hselasky@hselasky_laptop001 on 2009/03/30 06:50:09

	
	Patch from Chuck Robey:
	- add missing "int"

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb.3#3 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb.3#3 (text+ko) ====

@@ -146,7 +146,7 @@
 .Fn libusb20_dev_set_power_mode "struct libusb20_device *pdev" "uint8_t power_mode"
 .Ft uint8_t
 .Fn libusb20_dev_get_power_mode "struct libusb20_device *pdev"
-.Ft
+.Ft int
 .Fn libusb20_dev_set_alt_index "struct libusb20_device *pdev" "uint8_t iface_index" "uint8_t alt_index"
 .Ft int
 .Fn libusb20_dev_get_device_desc "struct libusb20_device *pdev" "uint8_t iface_indexr", "char *buf" "uint8_t len"

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 07:46:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F62C10656D3; Mon, 30 Mar 2009 07:46:30 +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 DE89C10656E5
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 07:46:29 +0000 (UTC)
	(envelope-from hselasky@c2i.net)
Received: from swip.net (mailfe03.swip.net [212.247.154.65])
	by mx1.freebsd.org (Postfix) with ESMTP id 72BDD8FC13
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 07:46:29 +0000 (UTC)
	(envelope-from hselasky@c2i.net)
X-Cloudmark-Score: 0.000000 []
X-Cloudmark-Analysis: v=1.0 c=1 a=9zI5ssjooakA:10
	a=MXw7gxVQKqGXY79tIT8aFQ==:17 a=6I5d2MoRAAAA:8
	a=vMp3RfLH71UheV0lOacA:9 a=yS6Xjv1hqbgWZ1FSDjYA:7
	a=J5J-9_2WOFWFyM-h_jVzB9J3Zs4A:4 a=LY0hPdMaydYA:10
Received: from [62.113.132.61] (account mc467741@c2i.net HELO laptop)
	by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.6)
	with ESMTPA id 1222021529 for perforce@freebsd.org;
	Mon, 30 Mar 2009 08:46:25 +0200
From: Hans Petter Selasky <hselasky@c2i.net>
To: Perforce Change Reviews <perforce@freebsd.org>
Date: Mon, 30 Mar 2009 08:48:56 +0200
User-Agent: KMail/1.9.7
References: <200903300645.n2U6jI3m025539@repoman.freebsd.org>
In-Reply-To: <200903300645.n2U6jI3m025539@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200903300848.56969.hselasky@c2i.net>
Cc: 
Subject: Re: PERFORCE change 159992 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: Mon, 30 Mar 2009 07:46:32 -0000

On Monday 30 March 2009, Hans Petter Selasky wrote:
> http://perforce.freebsd.org/chv.cgi?CH=159992
>
> Change 159992 by hselasky@hselasky_laptop001 on 2009/03/30 06:45:12
>
>
> 	First patch from Sylvestra Gallon:
^^^ s/Sylvestra/Sylvestre/

> 	- at91_udp.c does not exist anymore, it is now replaced by at91dci
> 	in src/sys/dev/usb/controller. I have also removed the
> 	ohci_atmelarm.c because it is also included in src/sys/conf/files
>
> Affected files ...
>
> .. //depot/projects/usb/src/sys/arm/at91/files.at91#8 edit
>
> Differences ...
>
> ==== //depot/projects/usb/src/sys/arm/at91/files.at91#8 (text) ====
>
> @@ -13,12 +13,10 @@
>  	dependency	"spibus_if.h"
>  arm/at91/at91_tc.c		optional	at91_tc
>  arm/at91/at91_twi.c		optional	at91_twi
> -arm/at91/at91_udp.c		optional	at91_udp
>  arm/at91/if_ate.c		optional	ate
>  arm/at91/uart_bus_at91usart.c	optional	uart
>  arm/at91/uart_cpu_at91rm9200usart.c	optional	uart
>  arm/at91/uart_dev_at91usart.c	optional	uart
> -dev/usb/controller/ohci_atmelarm.c	optional	ohci
>  #
>  # All the boards we support
>  #



From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 08:18:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8444E1065672; Mon, 30 Mar 2009 08:18:54 +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 449A3106566B
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 08:18:54 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 319BD8FC1B
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 08:18:54 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2U8IsD3042038
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 08:18:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2U8Ispp042036
	for perforce@freebsd.org; Mon, 30 Mar 2009 08:18:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 30 Mar 2009 08:18:54 GMT
Message-Id: <200903300818.n2U8Ispp042036@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159995 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: Mon, 30 Mar 2009 08:18:55 -0000

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

Change 159995 by hselasky@hselasky_laptop001 on 2009/03/30 08:18:12

	
	USB HID + USB input:
	- add support for more complicated HID descriptors
	  which can have multiple definitions of the same
	  field.
	- remove old modulo patch in ums, which I think is due
	  to bad HID parsing, which should be fixed now.
	
	Problem reported by: Alexander Leidinger

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#9 (text+ko) ====

@@ -84,28 +84,21 @@
 #define	UMS_IFQ_MAXLEN   50		/* units */
 #define	UMS_BUTTON_MAX   31		/* exclusive, must be less than 32 */
 #define	UMS_BUT(i) ((i) < 3 ? (((i) + 2) % 3) : (i))
+#define	UMS_INFO_MAX	  2		/* maximum number of HID sets */
 
 enum {
 	UMS_INTR_DT,
 	UMS_N_TRANSFER,
 };
 
-struct ums_softc {
-	struct usb2_fifo_sc sc_fifo;
-	struct mtx sc_mtx;
-	struct usb2_callout sc_callout;
+struct ums_info {
 	struct hid_location sc_loc_w;
 	struct hid_location sc_loc_x;
 	struct hid_location sc_loc_y;
 	struct hid_location sc_loc_z;
 	struct hid_location sc_loc_t;
 	struct hid_location sc_loc_btn[UMS_BUTTON_MAX];
-	mousehw_t sc_hw;
-	mousemode_t sc_mode;
-	mousestatus_t sc_status;
 
-	struct usb2_xfer *sc_xfer[UMS_N_TRANSFER];
-
 	uint32_t sc_flags;
 #define	UMS_FLAG_X_AXIS     0x0001
 #define	UMS_FLAG_Y_AXIS     0x0002
@@ -115,14 +108,29 @@
 #define	UMS_FLAG_REVZ	    0x0020	/* Z-axis is reversed */
 #define	UMS_FLAG_W_AXIS     0x0040
 
-	uint8_t	sc_buttons;
-	uint8_t	sc_iid;
 	uint8_t	sc_iid_w;
 	uint8_t	sc_iid_x;
 	uint8_t	sc_iid_y;
 	uint8_t	sc_iid_z;
 	uint8_t	sc_iid_t;
 	uint8_t	sc_iid_btn[UMS_BUTTON_MAX];
+	uint8_t	sc_buttons;
+};
+
+struct ums_softc {
+	struct usb2_fifo_sc sc_fifo;
+	struct mtx sc_mtx;
+	struct usb2_callout sc_callout;
+	struct ums_info sc_info[UMS_INFO_MAX];
+
+	mousehw_t sc_hw;
+	mousemode_t sc_mode;
+	mousestatus_t sc_status;
+
+	struct usb2_xfer *sc_xfer[UMS_N_TRANSFER];
+
+	uint8_t	sc_buttons;
+	uint8_t	sc_iid;
 	uint8_t	sc_temp[64];
 };
 
@@ -165,14 +173,15 @@
 ums_intr_callback(struct usb2_xfer *xfer)
 {
 	struct ums_softc *sc = xfer->priv_sc;
+	struct ums_info *info = &sc->sc_info[0];
 	uint8_t *buf = sc->sc_temp;
 	uint16_t len = xfer->actlen;
 	int32_t buttons = 0;
-	int32_t dw;
-	int32_t dx;
-	int32_t dy;
-	int32_t dz;
-	int32_t dt;
+	int32_t dw = 0;
+	int32_t dx = 0;
+	int32_t dy = 0;
+	int32_t dz = 0;
+	int32_t dt = 0;
 	uint8_t i;
 	uint8_t id;
 
@@ -205,49 +214,50 @@
 
 		} else {
 			id = 0;
-			if (sc->sc_flags & UMS_FLAG_SBU) {
+			if (sc->sc_info[0].sc_flags & UMS_FLAG_SBU) {
 				if ((*buf == 0x14) || (*buf == 0x15)) {
 					goto tr_setup;
 				}
 			}
 		}
 
-		if ((sc->sc_flags & UMS_FLAG_W_AXIS) && (id == sc->sc_iid_w))
-			dw = hid_get_data(buf, len, &sc->sc_loc_w);
-		else
-			dw = 0;
+	repeat:
+		if ((info->sc_flags & UMS_FLAG_W_AXIS) &&
+		    (id == info->sc_iid_w))
+			dw += hid_get_data(buf, len, &info->sc_loc_w);
 
-		if ((sc->sc_flags & UMS_FLAG_X_AXIS) && (id == sc->sc_iid_x))
-			dx = hid_get_data(buf, len, &sc->sc_loc_x);
-		else
-			dx = 0;
+		if ((info->sc_flags & UMS_FLAG_X_AXIS) && 
+		    (id == info->sc_iid_x))
+			dx += hid_get_data(buf, len, &info->sc_loc_x);
 
-		if ((sc->sc_flags & UMS_FLAG_Y_AXIS) && (id == sc->sc_iid_y))
-			dy = -hid_get_data(buf, len, &sc->sc_loc_y);
-		else
-			dy = 0;
+		if ((info->sc_flags & UMS_FLAG_Y_AXIS) &&
+		    (id == info->sc_iid_y))
+			dy = -hid_get_data(buf, len, &info->sc_loc_y);
 
-		if ((sc->sc_flags & UMS_FLAG_Z_AXIS) && (id == sc->sc_iid_z))
-			dz = -hid_get_data(buf, len, &sc->sc_loc_z);
-		else
-			dz = 0;
+		if ((info->sc_flags & UMS_FLAG_Z_AXIS) &&
+		    (id == info->sc_iid_z)) {
+			int32_t temp;
+			temp = hid_get_data(buf, len, &info->sc_loc_z);
+			if (info->sc_flags & UMS_FLAG_REVZ)
+				temp = -temp;
+			dz -= temp;
+		}
 
-		if (sc->sc_flags & UMS_FLAG_REVZ)
-			dz = -dz;
+		if ((info->sc_flags & UMS_FLAG_T_AXIS) &&
+		    (id == info->sc_iid_t))
+			dt -= hid_get_data(buf, len, &info->sc_loc_t);
 
-		if ((sc->sc_flags & UMS_FLAG_T_AXIS) && (id == sc->sc_iid_t))
-			dt = -hid_get_data(buf, len, &sc->sc_loc_t);
-		else
-			dt = 0;
-
-		for (i = 0; i < sc->sc_buttons; i++) {
-			if (id != sc->sc_iid_btn[i])
+		for (i = 0; i < info->sc_buttons; i++) {
+			if (id != info->sc_iid_btn[i])
 				continue;
-			if (hid_get_data(buf, len, &sc->sc_loc_btn[i])) {
+			if (hid_get_data(buf, len, &info->sc_loc_btn[i])) {
 				buttons |= (1 << UMS_BUT(i));
 			}
 		}
 
+		if (++info != &sc->sc_info[UMS_INFO_MAX])
+			goto repeat;
+
 		if (dx || dy || dz || dt || dw ||
 		    (buttons != sc->sc_status.button)) {
 
@@ -273,7 +283,7 @@
 		         * to the queue.  In any other case we delete
 		         * the timeout event.
 		         */
-			if ((sc->sc_flags & UMS_FLAG_SBU) &&
+			if ((sc->sc_info[0].sc_flags & UMS_FLAG_SBU) &&
 			    (dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) &&
 			    (dw == 0) && (buttons == 0)) {
 
@@ -357,89 +367,56 @@
 	return (error);
 }
 
-static int
-ums_attach(device_t dev)
+static void
+ums_hid_parse(struct ums_softc *sc, device_t dev, const uint8_t *buf,
+    uint16_t len, uint8_t index)
 {
-	struct usb2_attach_arg *uaa = device_get_ivars(dev);
-	struct ums_softc *sc = device_get_softc(dev);
-	void *d_ptr = NULL;
-	int unit = device_get_unit(dev);
-	int isize;
-	int isizebits;
-	int err;
+	struct ums_info *info = &sc->sc_info[index];
 	uint32_t flags;
-	uint16_t d_len;
 	uint8_t i;
 
-	DPRINTFN(11, "sc=%p\n", sc);
-
-	device_set_usb2_desc(dev);
-
-	mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE);
-
-	usb2_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
+	if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
+	    hid_input, index, &info->sc_loc_x, &flags, &info->sc_iid_x)) {
 
-	/*
-         * Force the report (non-boot) protocol.
-         *
-         * Mice without boot protocol support may choose not to implement
-         * Set_Protocol at all; Ignore any error.
-         */
-	err = usb2_req_set_protocol(uaa->device, NULL, uaa->info.bIfaceIndex, 1);
-
-	err = usb2_transfer_setup(uaa->device,
-	    &uaa->info.bIfaceIndex, sc->sc_xfer, ums_config,
-	    UMS_N_TRANSFER, sc, &sc->sc_mtx);
-
-	if (err) {
-		DPRINTF("error=%s\n", usb2_errstr(err));
-		goto detach;
-	}
-	err = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr,
-	    &d_len, M_TEMP, uaa->info.bIfaceIndex);
-
-	if (err) {
-		device_printf(dev, "error reading report description\n");
-		goto detach;
-	}
-	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
-	    hid_input, &sc->sc_loc_x, &flags, &sc->sc_iid_x)) {
-
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-			sc->sc_flags |= UMS_FLAG_X_AXIS;
+			info->sc_flags |= UMS_FLAG_X_AXIS;
 		}
 	}
-	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
-	    hid_input, &sc->sc_loc_y, &flags, &sc->sc_iid_y)) {
+	if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
+	    hid_input, index, &info->sc_loc_y, &flags, &info->sc_iid_y)) {
 
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-			sc->sc_flags |= UMS_FLAG_Y_AXIS;
+			info->sc_flags |= UMS_FLAG_Y_AXIS;
 		}
 	}
 	/* Try the wheel first as the Z activator since it's tradition. */
-	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP,
-	    HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z) ||
-	    hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP,
-	    HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) {
+	if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP,
+	    HUG_WHEEL), hid_input, index, &info->sc_loc_z, &flags,
+	    &info->sc_iid_z) ||
+	    hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP,
+	    HUG_TWHEEL), hid_input, index, &info->sc_loc_z, &flags,
+	    &info->sc_iid_z)) {
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-			sc->sc_flags |= UMS_FLAG_Z_AXIS;
+			info->sc_flags |= UMS_FLAG_Z_AXIS;
 		}
 		/*
 		 * We might have both a wheel and Z direction, if so put
 		 * put the Z on the W coordinate.
 		 */
-		if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP,
-		    HUG_Z), hid_input, &sc->sc_loc_w, &flags, &sc->sc_iid_w)) {
+		if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP,
+		    HUG_Z), hid_input, index, &info->sc_loc_w, &flags,
+		    &info->sc_iid_w)) {
 
 			if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-				sc->sc_flags |= UMS_FLAG_W_AXIS;
+				info->sc_flags |= UMS_FLAG_W_AXIS;
 			}
 		}
-	} else if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP,
-	    HUG_Z), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) {
+	} else if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP,
+	    HUG_Z), hid_input, index, &info->sc_loc_z, &flags, 
+	    &info->sc_iid_z)) {
 
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-			sc->sc_flags |= UMS_FLAG_Z_AXIS;
+			info->sc_flags |= UMS_FLAG_Z_AXIS;
 		}
 	}
 	/*
@@ -449,25 +426,89 @@
 	 * There are no other HID axis descriptors other than X,Y and
 	 * TWHEEL
 	 */
-	if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL),
-	    hid_input, &sc->sc_loc_t, &flags, &sc->sc_iid_t)) {
+	if (hid_locate(buf, len, HID_USAGE2(HUP_GENERIC_DESKTOP,
+	    HUG_TWHEEL), hid_input, index, &info->sc_loc_t, 
+	    &flags, &info->sc_iid_t)) {
 
-		sc->sc_loc_t.pos += 8;
+		info->sc_loc_t.pos += 8;
 
 		if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) {
-			sc->sc_flags |= UMS_FLAG_T_AXIS;
+			info->sc_flags |= UMS_FLAG_T_AXIS;
 		}
 	}
 	/* figure out the number of buttons */
 
 	for (i = 0; i < UMS_BUTTON_MAX; i++) {
-		if (!hid_locate(d_ptr, d_len, HID_USAGE2(HUP_BUTTON, (i + 1)),
-			hid_input, &sc->sc_loc_btn[i], NULL, &sc->sc_iid_btn[i])) {
+		if (!hid_locate(buf, len, HID_USAGE2(HUP_BUTTON, (i + 1)),
+		    hid_input, index, &info->sc_loc_btn[i], NULL, 
+		    &info->sc_iid_btn[i])) {
 			break;
 		}
 	}
+	info->sc_buttons = i;
+
+	if (i > sc->sc_buttons)
+		sc->sc_buttons = i;
+
+	if (info->sc_flags == 0)
+		return;
+
+	/* announce information about the mouse */
+	device_printf(dev, "%d buttons and [%s%s%s%s%s] coordinates ID=%u\n",
+	    (info->sc_buttons),
+	    (info->sc_flags & UMS_FLAG_X_AXIS) ? "X" : "",
+	    (info->sc_flags & UMS_FLAG_Y_AXIS) ? "Y" : "",
+	    (info->sc_flags & UMS_FLAG_Z_AXIS) ? "Z" : "",
+	    (info->sc_flags & UMS_FLAG_T_AXIS) ? "T" : "",
+	    (info->sc_flags & UMS_FLAG_W_AXIS) ? "W" : "",
+	    info->sc_iid_x);
+}
+
+static int
+ums_attach(device_t dev)
+{
+	struct usb2_attach_arg *uaa = device_get_ivars(dev);
+	struct ums_softc *sc = device_get_softc(dev);
+	struct ums_info *info;
+	void *d_ptr = NULL;
+	int isize;
+	int err;
+	uint16_t d_len;
+	uint8_t i;
+	uint8_t j;
+
+	DPRINTFN(11, "sc=%p\n", sc);
 
-	sc->sc_buttons = i;
+	device_set_usb2_desc(dev);
+
+	mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE);
+
+	usb2_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
+
+	/*
+         * Force the report (non-boot) protocol.
+         *
+         * Mice without boot protocol support may choose not to implement
+         * Set_Protocol at all; Ignore any error.
+         */
+	err = usb2_req_set_protocol(uaa->device, NULL,
+	    uaa->info.bIfaceIndex, 1);
+
+	err = usb2_transfer_setup(uaa->device,
+	    &uaa->info.bIfaceIndex, sc->sc_xfer, ums_config,
+	    UMS_N_TRANSFER, sc, &sc->sc_mtx);
+
+	if (err) {
+		DPRINTF("error=%s\n", usb2_errstr(err));
+		goto detach;
+	}
+	err = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr,
+	    &d_len, M_TEMP, uaa->info.bIfaceIndex);
+
+	if (err) {
+		device_printf(dev, "error reading report description\n");
+		goto detach;
+	}
 
 	isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid);
 
@@ -478,83 +519,66 @@
 	 * it has two addional buttons and a tilt wheel.
 	 */
 	if (usb2_test_quirk(uaa, UQ_MS_BAD_CLASS)) {
-		sc->sc_flags = (UMS_FLAG_X_AXIS |
+		info = &sc->sc_info[0];
+		info->sc_flags = (UMS_FLAG_X_AXIS |
 		    UMS_FLAG_Y_AXIS |
 		    UMS_FLAG_Z_AXIS |
 		    UMS_FLAG_SBU);
-		sc->sc_buttons = 3;
+		info->sc_buttons = 3;
 		isize = 5;
-		sc->sc_iid = 0;
-		sc->sc_iid_x = 0;
-		sc->sc_iid_y = 0;
-		sc->sc_iid_z = 0;
-		sc->sc_iid_btn[0] = 0;
-		sc->sc_iid_btn[1] = 0;
-		sc->sc_iid_btn[2] = 0;
 		/* 1st byte of descriptor report contains garbage */
-		sc->sc_loc_x.pos = 16;
-		sc->sc_loc_y.pos = 24;
-		sc->sc_loc_z.pos = 32;
-		sc->sc_loc_btn[0].pos = 8;
-		sc->sc_loc_btn[1].pos = 9;
-		sc->sc_loc_btn[2].pos = 10;
-	}
+		info->sc_loc_x.pos = 16;
+		info->sc_loc_y.pos = 24;
+		info->sc_loc_z.pos = 32;
+		info->sc_loc_btn[0].pos = 8;
+		info->sc_loc_btn[1].pos = 9;
+		info->sc_loc_btn[2].pos = 10;
+
+		/* Announce device */
+		device_printf(dev, "3 buttons and [XYZ] "
+		    "coordinates ID=0\n");
 
-	/*
-	 * Some Microsoft devices have incorrectly high location
-	 * positions. Correct this:
-	 */
-	isizebits = isize * 8;
-	if ((sc->sc_iid != 0) && (isizebits > 8)) {
-		isizebits -= 8;	/* remove size of report ID */
-		sc->sc_loc_w.pos %= isizebits;
-		sc->sc_loc_x.pos %= isizebits;
-		sc->sc_loc_y.pos %= isizebits;
-		sc->sc_loc_z.pos %= isizebits;
-		sc->sc_loc_t.pos %= isizebits;
-		for (i = 0; i != UMS_BUTTON_MAX; i++)
-			sc->sc_loc_btn[i].pos %= isizebits;
+	} else {
+		/* Search the HID descriptor and announce device */
+		for (i = 0; i < UMS_INFO_MAX; i++) {
+			ums_hid_parse(sc, dev, d_ptr, d_len, i);
+		}
 	}
 
 	if (usb2_test_quirk(uaa, UQ_MS_REVZ)) {
+		info = &sc->sc_info[0];
 		/* Some wheels need the Z axis reversed. */
-		sc->sc_flags |= UMS_FLAG_REVZ;
+		info->sc_flags |= UMS_FLAG_REVZ;
 	}
 	if (isize > sc->sc_xfer[UMS_INTR_DT]->max_frame_size) {
 		DPRINTF("WARNING: report size, %d bytes, is larger "
 		    "than interrupt size, %d bytes!\n",
 		    isize, sc->sc_xfer[UMS_INTR_DT]->max_frame_size);
 	}
-	/* announce information about the mouse */
-
-	device_printf(dev, "%d buttons and [%s%s%s%s%s] coordinates\n",
-	    (sc->sc_buttons),
-	    (sc->sc_flags & UMS_FLAG_X_AXIS) ? "X" : "",
-	    (sc->sc_flags & UMS_FLAG_Y_AXIS) ? "Y" : "",
-	    (sc->sc_flags & UMS_FLAG_Z_AXIS) ? "Z" : "",
-	    (sc->sc_flags & UMS_FLAG_T_AXIS) ? "T" : "",
-	    (sc->sc_flags & UMS_FLAG_W_AXIS) ? "W" : "");
-
 	free(d_ptr, M_TEMP);
 	d_ptr = NULL;
 
 #if USB_DEBUG
-	DPRINTF("sc=%p\n", sc);
-	DPRINTF("X\t%d/%d id=%d\n", sc->sc_loc_x.pos,
-	    sc->sc_loc_x.size, sc->sc_iid_x);
-	DPRINTF("Y\t%d/%d id=%d\n", sc->sc_loc_y.pos,
-	    sc->sc_loc_y.size, sc->sc_iid_y);
-	DPRINTF("Z\t%d/%d id=%d\n", sc->sc_loc_z.pos,
-	    sc->sc_loc_z.size, sc->sc_iid_z);
-	DPRINTF("T\t%d/%d id=%d\n", sc->sc_loc_t.pos,
-	    sc->sc_loc_t.size, sc->sc_iid_t);
-	DPRINTF("W\t%d/%d id=%d\n", sc->sc_loc_w.pos,
-	    sc->sc_loc_w.size, sc->sc_iid_w);
+	for (j = 0; j < UMS_INFO_MAX; j++) {
+		info = &sc->sc_info[j];
+
+		DPRINTF("sc=%p, index=%d\n", sc, j);
+		DPRINTF("X\t%d/%d id=%d\n", info->sc_loc_x.pos,
+		    info->sc_loc_x.size, info->sc_iid_x);
+		DPRINTF("Y\t%d/%d id=%d\n", info->sc_loc_y.pos,
+		    info->sc_loc_y.size, info->sc_iid_y);
+		DPRINTF("Z\t%d/%d id=%d\n", info->sc_loc_z.pos,
+		    info->sc_loc_z.size, info->sc_iid_z);
+		DPRINTF("T\t%d/%d id=%d\n", info->sc_loc_t.pos,
+		    info->sc_loc_t.size, info->sc_iid_t);
+		DPRINTF("W\t%d/%d id=%d\n", info->sc_loc_w.pos,
+		    info->sc_loc_w.size, info->sc_iid_w);
 
-	for (i = 0; i < sc->sc_buttons; i++) {
-		DPRINTF("B%d\t%d/%d id=%d\n",
-		    i + 1, sc->sc_loc_btn[i].pos,
-		    sc->sc_loc_btn[i].size, sc->sc_iid_btn[i]);
+		for (i = 0; i < info->sc_buttons; i++) {
+			DPRINTF("B%d\t%d/%d id=%d\n",
+			    i + 1, info->sc_loc_btn[i].pos,
+			    info->sc_loc_btn[i].size, info->sc_iid_btn[i]);
+		}
 	}
 	DPRINTF("size=%d, id=%d\n", isize, sc->sc_iid);
 #endif
@@ -578,16 +602,9 @@
 	sc->sc_mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
 	sc->sc_mode.syncmask[1] = MOUSE_MSC_SYNC;
 
-	sc->sc_status.flags = 0;
-	sc->sc_status.button = 0;
-	sc->sc_status.obutton = 0;
-	sc->sc_status.dx = 0;
-	sc->sc_status.dy = 0;
-	sc->sc_status.dz = 0;
-
 	err = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
 	    &ums_fifo_methods, &sc->sc_fifo,
-	    unit, 0 - 1, uaa->info.bIfaceIndex,
+	    device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex,
   	    UID_ROOT, GID_OPERATOR, 0644);
 	if (err) {
 		goto detach;

==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#29 (text+ko) ====

@@ -544,13 +544,15 @@
  *------------------------------------------------------------------------*/
 int
 hid_locate(const void *desc, usb2_size_t size, uint32_t u, enum hid_kind k,
-    struct hid_location *loc, uint32_t *flags, uint8_t *id)
+    uint8_t index, struct hid_location *loc, uint32_t *flags, uint8_t *id)
 {
 	struct hid_data *d;
 	struct hid_item h;
 
 	for (d = hid_start_parse(desc, size, 1 << k); hid_get_item(d, &h);) {
 		if (h.kind == k && !(h.flags & HIO_CONST) && h.usage == u) {
+			if (index--)
+				continue;
 			if (loc != NULL)
 				*loc = h.loc;
 			if (flags != NULL)

==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#17 (text+ko) ====

@@ -80,7 +80,7 @@
 int	hid_report_size(const void *buf, usb2_size_t len, enum hid_kind k,
 	    uint8_t *id);
 int	hid_locate(const void *desc, usb2_size_t size, uint32_t usage,
-	    enum hid_kind kind, struct hid_location *loc,
+	    enum hid_kind kind, uint8_t index, struct hid_location *loc,
 	    uint32_t *flags, uint8_t *id);
 uint32_t hid_get_data(const uint8_t *buf, usb2_size_t len,
 	    struct hid_location *loc);

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 13:26:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89250106566C; Mon, 30 Mar 2009 13:26:21 +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 3D3541065678
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 13:26:21 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AA3E8FC19
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 13:26:21 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2UDQLR4094044
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 13:26:21 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2UDQL7H094042
	for perforce@freebsd.org; Mon, 30 Mar 2009 13:26:21 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 30 Mar 2009 13:26:21 GMT
Message-Id: <200903301326.n2UDQL7H094042@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160007 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: Mon, 30 Mar 2009 13:26:22 -0000

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

Change 160007 by pgj@beehive on 2009/03/30 13:25:22

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#11 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#11 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml,v 1.2 2008/12/22 13:16:33 pgj Exp $
+  $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml,v 1.3 2009/03/29 05:32:55 pgj Exp $
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 15:12:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0FA381065676; Mon, 30 Mar 2009 15:12:12 +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 C23331065672
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 15:12:11 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A47258FC1A
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 15:12:11 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2UFCBCV005269
	for <perforce@freebsd.org>; Mon, 30 Mar 2009 15:12:11 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2UFCBvT005267
	for perforce@freebsd.org; Mon, 30 Mar 2009 15:12:11 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 30 Mar 2009 15:12:11 GMT
Message-Id: <200903301512.n2UFCBvT005267@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160011 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: Mon, 30 Mar 2009 15:12:12 -0000

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

Change 160011 by trasz@trasz_victim7 on 2009/03/30 15:11:35

	Simplify vfs_unixify_accmode() usage.  Completely untested.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#12 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#28 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#24 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 (text+ko) ====

@@ -3969,7 +3969,8 @@
 	int error;
 	accmode_t accmode = ap->a_accmode;
 
-	if (vfs_unixify_accmode(&accmode, &error))
+	error = vfs_unixify_accmode(&accmode);
+	if (error != 0)
 		return (error);
 
 	/*

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#12 (text+ko) ====

@@ -71,7 +71,8 @@
 	if (privused != NULL)
 		*privused = 0;
 
-	if (vfs_unixify_accmode(&accmode, &error))
+	error = vfs_unixify_accmode(&accmode);
+	if (error != 0)
 		return (error);
 
 	/*

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#28 (text+ko) ====

@@ -3548,7 +3548,8 @@
 
 	dac_granted = 0;
 
-	if (vfs_unixify_accmode(&accmode, &error))
+	error = vfs_unixify_accmode(&accmode);
+	if (error != 0)
 		return (error);
 
 	/* Check the owner. */
@@ -4278,26 +4279,28 @@
  * reducing it into standard unix access bits - VEXEC, VREAD, VWRITE
  * and VADMIN.
  *
- * This routine is supposed to be called from the beginning of vaccess
+ * This routine is supposed to be called at the beginning of vaccess
  * implementations that don't know anything about granularity.  If it
- * returns 1, then the caller is supposed to return whatever this routine
- * puts into variable pointed to by "error".
+ * returns 0, then the caller is supposed to continue with the usual
+ * access checks using 'accmode' as modified by this routine.  If it
+ * returns nonzero value, the caller is supposed to return that value
+ * as errno.
+ *
+ * Note that after this routine runs, accmode may be zero.
  */
 int
-vfs_unixify_accmode(accmode_t *accmode, int *error)
+vfs_unixify_accmode(accmode_t *accmode)
 {
 	/*
 	 * Unix does not provide any explicit "deny" access rules.
 	 */
 	if (*accmode & VEXPLICIT_DENY) {
-		*error = 0;
-		return (1);
+		*accmode = 0;
+		return (0);
 	}
 
-	if (*accmode & (VDELETE_CHILD | VDELETE)) {
-		*error = EPERM;
-		return (1);
-	}
+	if (*accmode & (VDELETE_CHILD | VDELETE))
+		return (EPERM);
 
 	if (*accmode & VADMIN_PERMS) {
 		*accmode &= ~VADMIN_PERMS;
@@ -4306,11 +4309,5 @@
 
 	*accmode &= ~(VSTAT_PERMS | VSYNCHRONIZE);
 
-	if (*accmode == 0) {
-		*error = 0;
-		return (1);
-	}
-
 	return (0);
 }
-

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#24 (text+ko) ====

@@ -625,7 +625,7 @@
 int	vaccess_acl_nfs4(enum vtype type, uid_t file_uid,
 	    gid_t file_gid, struct acl *acl, accmode_t accmode,
 	    struct ucred *cred, int *privused);
-int	vfs_unixify_accmode(accmode_t *accmode, int *error);
+int	vfs_unixify_accmode(accmode_t *accmode);
 void	vattr_null(struct vattr *vap);
 int	vcount(struct vnode *vp);
 void	vdrop(struct vnode *);

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 16:16:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D1BB1065677; Mon, 30 Mar 2009 16:16: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 DC2BC1065672
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 16:16:16 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C75E88FC2B
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 16:16:16 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2UGGGg4011666
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 16:16:16 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2UGGGY0011664
	for perforce@freebsd.org; Mon, 30 Mar 2009 16:16:16 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 30 Mar 2009 16:16:16 GMT
Message-Id: <200903301616.n2UGGGY0011664@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160014 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: Mon, 30 Mar 2009 16:16:20 -0000

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

Change 160014 by rene@rene_self on 2009/03/30 16:16:11

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#18 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#17 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/bibliography.sgml#4 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#3 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#14 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#14 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/skreuzer.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/bibliography.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#14 integrate
.. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#4 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#15 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#8 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#7 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#31 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#18 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.845 2009/03/15 07:42:01 manolis Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.846 2009/03/25 18:41:34 skreuzer Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -9031,11 +9031,6 @@
     </listitem>
 
     <listitem>
-      <para>Steven Kreuzer
-	<email>skreuzer@exit2shell.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Steven McCanne
 	<email>mccanne@cs.berkeley.edu</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#17 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.256 2009/03/17 14:52:00 fabient Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.257 2009/03/25 18:41:37 skreuzer Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -623,6 +623,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.skreuzer;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.keramida;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#15 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.421 2009/02/27 06:28:22 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.422 2009/03/30 12:21:29 blackend Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -882,13 +882,14 @@
 
 	  <programlisting>device ath               # Atheros IEEE 802.11 wireless network driver
 device ath_hal           # Atheros Hardware Access Layer
-device ath_rate_sample   # John Bicket's SampleRate control algorithm.
-device wlan              # 802.11 support (Required)
+options AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
+device ath_rate_sample   # SampleRate tx rate control for ath
+device wlan              # 802.11 support
 device wlan_scan_ap      # 802.11 AP mode scanning
 device wlan_scan_sta     # 802.11 STA mode scanning
-device wlan_wep          # WEP crypto support for 802.11 devices
-device wlan_ccmp         # AES-CCMP crypto support for 802.11 devices
-device wlan_tkip         # TKIP and Michael crypto support for 802.11 devices</programlisting>
+device wlan_wep          # 802.11 WEP support
+device wlan_ccmp         # 802.11 CCMP support
+device wlan_tkip         # 802.11 TKIP support</programlisting>
 
 	  <para>Both <literal>wlan_scan_ap</literal> and
 	    <literal>wlan_scan_sta</literal> lines are required by

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#16 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.474 2009/03/17 14:52:00 fabient Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.475 2009/03/25 18:41:42 skreuzer Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -992,6 +992,8 @@
 
 <!ENTITY a.simon "Simon L. Nielsen <email>simon@FreeBSD.org</email>">
 
+<!ENTITY a.skreuzer "Steven Kreuzer <email>skreuzer@FreeBSD.org</email>">
+
 <!ENTITY a.skv "Sergey Skvortsov <email>skv@FreeBSD.org</email>">
 
 <!ENTITY a.smace "Scott Mace <email>smace@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/bibliography.sgml#4 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
   The FreeBSD Dutch Documentation Project
 
-  $FreeBSD: $
+  $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/bibliography.sgml,v 1.2 2009/03/23 17:28:26 rene Exp $
 
   %SOURCE%	share/sgml/bibliography.sgml
-  %SRCID%	1.9
+  %SRCID%	1.10
 -->
 
 <bibliography id="bibliography">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#3 (text+ko) ====

@@ -1,21 +1,22 @@
 <!--
-     Trademark Legend, as required by The Open Group, Sun, etc..
+     Legenda van handelsmerken, zoals vereist door The Open Group, Sun,
+     enzovoorts.
 
-     This file contains entities with trademark attributions for all
-     the companies the FreeBSD documentation references.  It also
-     contains entities for common products with proper trademark
-     symbols.
+     Dit bestand bevat entiteiten met handelsmerktoekenningen voor alle
+     bedrijven waarnaar de documentatie van FreeBSD verwijst.  Het bevat
+     ook entiteiten voor algemene producten met geschikte
+     handelsmerksymbolen.
 
-     Please keep this file sorted.
+     Houd dit bestand alstublieft gesorteerd.
 
-     $FreeBSD: $
-     %SOURCE%	share/smgl/trademarks.ent
+     $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.2 2009/03/29 15:01:00 rene Exp $
+     %SOURCE%	share/sgml/trademarks.ent
      %SRCID%	1.44
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com en HomeConnect zijn geregistreerde
   handelsmerken van 3Com Corporation.</para>">
-<!-- An SGML entity can't start with a number... -->
+<!-- Een SGML-entiteit kan niet met een nummer beginnen... -->
 <!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware en Escalade zijn geregistreerde
@@ -242,7 +243,7 @@
   Pioneers, Ltd.</para>">
 <!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
 
-<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
+<!-- http://www.netbsd.org/Misc/about.html, ack'd door http://www.uspto.gov/ -->
 <!ENTITY tm-attrib.netbsd "<para>NetBSD is een geregistreerd handelsmerk
   van de NetBSD Foundation.</para>">
 
@@ -299,7 +300,7 @@
   Inc.</para>">
 <!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
 
-<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
+<!-- Noot: RedHat gebruikt (r)/(tm) niet voor hun eigen handelsmerken -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
 <!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, zijn handelsmerken of
   geregistreerde handelsmerken van Red Hat, Inc. in de Verenigde Staten
@@ -332,7 +333,6 @@
 <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
 
 <!-- http://www.sun.com/suntrademarks/ -->
-
 <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
   Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
   Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, en

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.91 2009/03/17 14:52:00 fabient Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.92 2009/03/25 18:41:42 skreuzer Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -551,6 +551,11 @@
       &pgpkey.kris;
     </sect2>
 
+    <sect2 id="pgpkey-skreuzer">
+      <title>&a.skreuzer;</title>
+      &pgpkey.skreuzer;
+    </sect2>
+
     <sect2 id="pgpkey-fjoe">
       <title>&a.fjoe;</title>
       &pgpkey.fjoe;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#14 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.187 2009/03/17 14:52:00 fabient Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.188 2009/03/25 18:41:43 skreuzer Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -264,6 +264,7 @@
 <!ENTITY pgpkey.shaun SYSTEM "shaun.key">
 <!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.key">
 <!ENTITY pgpkey.simon SYSTEM "simon.key">
+<!ENTITY pgpkey.skreuzer SYSTEM "skreuzer.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">
 <!ENTITY pgpkey.sson SYSTEM "sson.key">
 <!ENTITY pgpkey.ssouhlal SYSTEM "ssouhlal.key">

==== //depot/projects/docproj_nl/share/sgml/bibliography.sgml#3 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD: doc/share/sgml/bibliography.sgml,v 1.9 2004/09/22 19:38:51 ceri Exp $
+  $FreeBSD: doc/share/sgml/bibliography.sgml,v 1.10 2009/03/23 16:22:27 rene Exp $
 -->
 
 <bibliography id="bibliography">

==== //depot/projects/docproj_nl/www/en/developers.sgml#14 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.216 2009/03/17 14:52:00 fabient Exp $
+$FreeBSD: www/en/developers.sgml,v 1.217 2009/03/25 19:43:16 skreuzer Exp $
 
 -->
 
@@ -496,6 +496,7 @@
 <!ENTITY a.silby "Mike Silbersack">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. Nielsen">
+<!ENTITY a.skreuzer "Steven Kreuzer">
 <!ENTITY a.skv "Sergey Skvortsov">
 <!ENTITY a.smace "Scott Mace">
 <!ENTITY a.smkelly "Sean Kelly">

==== //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#4 (text+ko) ====

@@ -15,7 +15,7 @@
 <ideas>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.128 2009/03/22 21:11:13 erwin Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.130 2009/03/26 14:14:18 brooks Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -404,7 +404,9 @@
       <title>Avoiding syscall overhead</title>
 
       <desc>
-<p><strong>Technical contact</strong>: <a href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
+<p><strong>Technical contact</strong>:
+  <a href="mailto:attilio@freebsd.org">Attilio Rao</a>,
+  <a href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
 
 <p>setproctitle() calls are a serious
   performance bottleneck in a default pgsql configuration (they are
@@ -424,6 +426,10 @@
   massive security holes, performance issues (perhaps not visible in
   simple benchmarks), etc.</p>
 
+<p>Work is currently in progress on this and is undergoing review.
+  It is not complete, but interested parties should contact Attilio
+  before beginning work.</p>
+
 <p><strong>Requirements</strong>:</p>
 <ul>
   <li>Strong knowledge of C.</li>

==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.1 2009/03/17 13:39:34 rwatson Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.2 2009/03/26 06:43:09 maxim Exp $">
 <!ENTITY local.rel "7.2">
 <!ENTITY local.rel.tag "7_2">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -38,7 +38,7 @@
     <tr>
       <td>Reminder announcement</td>
       <td>16&nbsp;March&nbsp;2009</td>
-      <td>--</td>
+      <td>17&nbsp;March&nbsp;2009</td>
       <td>Release Engineers send announcement email to
 	developers with a rough schedule for the FreeBSD
 	&local.rel; release.</td>
@@ -56,7 +56,7 @@
     <tr>
       <td>Code freeze begins</td>
       <td>23&nbsp;March&nbsp;2009</td>
-      <td>--</td>
+      <td>23&nbsp;March&nbsp;2009</td>
       <td>After this date, all commits to RELENG_7 must be approved by <a
 	  href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.  Certain highly
 	active documentation committers are exempt from this rule for

==== //depot/projects/docproj_nl/www/en/releng/index.sgml#15 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.254 2009/03/17 13:55:58 rwatson Exp $">
+<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.255 2009/03/24 05:55:40 maxim Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "Release Engineering Information">
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -86,8 +86,8 @@
 
     <tr>
       <td><tt>RELENG_7</tt></td>
-      <td>Open </td>
-      <td>committers</td>
+      <td>Frozen</td>
+      <td>&contact.re;</td>
       <td>Development branch for 7-STABLE.</td>
     </tr>
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#8 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.59 2009/03/28 19:05:11 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.59 2009/03/28 19:05:11 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -2781,7 +2781,7 @@
 
   <entry id="giganetworking" category="namerica">
     <name>Giganetworking</name>
-    <url>www.giganetworking.com</url>
+    <url>http://www.giganetworking.com</url>
     <description>
       Consulting in the areas of Internet security and data defense
       mainly with open source software. Particular knowledge of

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#7 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                             "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.44 2009/03/25 18:47:28 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.44 2009/03/25 18:47:28 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -379,6 +379,22 @@
     </description>
   </entry>
 
+  <entry id="associationkazar">
+    <name>Association Kazar</name>
+    <url>http://kazar.net</url>
+    <description>
+      Association Kazar, located in Paris, France, is a non-profit
+      organization that provides for everybody the ability to host
+      servers in our co-location, but also to use our co-location
+      services for web, email, ftp, and databases.  We are online since
+      1996, and use FreeBSD for almost everything.  We provide as well
+      connectivity and many other services for people located in Paris.
+      We host mailing lists for free if a member uses at least one of
+      our services.  We are fans of FreeBSD and use it on
+      intel/amd64/sparc64 machines.
+    </description>
+  </entry>
+
   <entry id="Venigo">
     <name>Venigo Internet Services</name>
     <url>http://www.venigo.fr/</url>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#31 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.234 2009/03/22 19:01:52 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.235 2009/03/25 19:43:16 skreuzer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -36,6 +36,15 @@
       <name>3</name>
 
       <day>
+        <name>25</name>
+
+        <event>
+          <p>New committer: <a href="mailto:skreuzer@FreeBSD.org">Steven
+	    Kreuzer</a> (ports)</p>
+        </event>
+      </day>
+
+      <day>
 	<name>22</name>
 
 	<event>

From owner-p4-projects@FreeBSD.ORG  Mon Mar 30 18:55:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2FF5C10656BE; Mon, 30 Mar 2009 18:55:01 +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 D98A1106568A
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 18:55:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C7ABD8FC24
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 18:55:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2UIt0U6037863
	for <perforce@FreeBSD.org>; Mon, 30 Mar 2009 18:55:00 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2UIt0EL037861
	for perforce@freebsd.org; Mon, 30 Mar 2009 18:55:00 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 30 Mar 2009 18:55:00 GMT
Message-Id: <200903301855.n2UIt0EL037861@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160024 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: Mon, 30 Mar 2009 18:55:02 -0000

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

Change 160024 by rene@rene_self on 2009/03/30 18:54:12

	MFen handbook/advanced-networking 1.421 -> 1.422

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#29 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#29 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.11 2009/02/27 17:22:46 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
-     %SRCID%   1.421
+     %SRCID%   1.422
 -->
 
 <chapter id="advanced-networking">
@@ -983,13 +983,14 @@
 
 	  <programlisting>device ath               # Atheros IEEE 802.11 stuurprogramma voor draadloze netwerken
 device ath_hal           # Atheros Hardware Access Layer
-device ath_rate_sample   # John Bicket's SampleRate stuuralgoritme.
-device wlan              # 802.11 ondersteuning (vereist)
+options AH_SUPPORT_AR5146 # zet AR5146 tx/rx descriptors aan
+device ath_rate_sample   # SampleRate verzendsnelheid-controle voor ath
+device wlan              # 802.11 ondersteuning
 device wlan_scan_ap      # 802.11 AP-modus scannen
 device wlan_scan_sta     # 802.11 STA-modus scannen
-device wlan_wep          # WEP crypto ondersteuning voor 802.11 apparaten
-device wlan_ccmp         # AES-CCMP crypto ondersteuning voor 802.11 apparaten
-device wlan_tkip         # TKIP en Michael crypto ondersteuning voor 802.11 apparaten</programlisting>
+device wlan_wep          # 802.11 WEP-ondersteuning
+device wlan_ccmp         # 802.11 CCMP-ondersteuning
+device wlan_tkip         # 802.11 TKIP-ondersteuning</programlisting>
 
 	  <para>Zowel <literal>wlan_scan_ap</literal> en
 	    <literal>wlan_scan_sta</literal> zijn nodig voor

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 13:53:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 00FC01065715; Tue, 31 Mar 2009 13:53:25 +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 B40DA10656D2
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A1FF38FC1B
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VDrOve007726
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 13:53:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VDrOnP007724
	for perforce@freebsd.org; Tue, 31 Mar 2009 13:53:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 31 Mar 2009 13:53:24 GMT
Message-Id: <200903311353.n2VDrOnP007724@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160052 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: Tue, 31 Mar 2009 13:53:26 -0000

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

Change 160052 by hselasky@hselasky_laptop001 on 2009/03/31 13:52:52

	
	USB serial:
	
	  - wait until line configuration is complete
	    before starting data transfers.
	
	Reported by Bernd Walter & more.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#2 (text+ko) ====

@@ -412,6 +412,12 @@
 	if (fn == usb2_com_cfg_close)
 		usb2_proc_mwait(&ssc->sc_tq, t0, t1);
 
+	/*
+	 * In case of multiple configure requests,
+	 * keep track of the last one!
+	 */
+	if (fn == usb2_com_cfg_start_transfers)
+		sc->sc_last_start_xfer = &task->hdr;
 }
 
 static void
@@ -458,7 +464,9 @@
 		/* TTY device closed */
 		return;
 	}
-	sc->sc_flag |= UCOM_FLAG_GP_DATA;
+
+	if (_task == sc->sc_last_start_xfer)
+		sc->sc_flag |= UCOM_FLAG_GP_DATA;
 
 	if (sc->sc_callback->usb2_com_start_read) {
 		(sc->sc_callback->usb2_com_start_read) (sc);

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#2 (text+ko) ====

@@ -152,6 +152,8 @@
 	struct usb2_com_cfg_task	sc_status_task[2];
 	struct usb2_com_param_task	sc_param_task[2];
 	struct cv sc_cv;
+	/* Used to set "UCOM_FLAG_GP_DATA" flag: */
+	struct usb2_proc_msg	*sc_last_start_xfer;
 	const struct usb2_com_callback *sc_callback;
 	struct usb2_com_super_softc *sc_super;
 	struct tty *sc_tty;

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 14:25:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E9A97106568E; Tue, 31 Mar 2009 14:25:07 +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 37E66106566C
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:25:06 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BBC08FC17
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:25:06 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VEP63f011689
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:25:06 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VEOu0I011641
	for perforce@freebsd.org; Tue, 31 Mar 2009 14:24:56 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Tue, 31 Mar 2009 14:24:56 GMT
Message-Id: <200903311424.n2VEOu0I011641@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160053 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: Tue, 31 Mar 2009 14:25:12 -0000

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

Change 160053 by lulf@lulf_carrot on 2009/03/31 14:24:10

	MFC

Affected files ...

.. //depot/projects/avr32/src/MAINTAINERS#2 integrate
.. //depot/projects/avr32/src/Makefile#2 integrate
.. //depot/projects/avr32/src/Makefile.inc1#4 integrate
.. //depot/projects/avr32/src/ObsoleteFiles.inc#4 integrate
.. //depot/projects/avr32/src/UPDATING#4 integrate
.. //depot/projects/avr32/src/bin/cat/Makefile#2 integrate
.. //depot/projects/avr32/src/bin/sh/alias.c#2 integrate
.. //depot/projects/avr32/src/bin/sh/miscbltin.c#2 integrate
.. //depot/projects/avr32/src/cddl/Makefile.inc#2 integrate
.. //depot/projects/avr32/src/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/avr32/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/avr32/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/avr32/src/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/avr32/src/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/avr32/src/contrib/bind9/version#2 integrate
.. //depot/projects/avr32/src/contrib/csup/rcsfile.c#2 integrate
.. //depot/projects/avr32/src/contrib/csup/rcsfile.h#2 integrate
.. //depot/projects/avr32/src/contrib/csup/rcsparse.c#2 integrate
.. //depot/projects/avr32/src/contrib/csup/updater.c#3 integrate
.. //depot/projects/avr32/src/contrib/gcc/c-cppbuiltin.c#2 integrate
.. //depot/projects/avr32/src/contrib/gcc/c-decl.c#2 integrate
.. //depot/projects/avr32/src/contrib/gcc/c-opts.c#2 integrate
.. //depot/projects/avr32/src/contrib/gcc/c-tree.h#2 integrate
.. //depot/projects/avr32/src/contrib/gcc/c-typeck.c#2 integrate
.. //depot/projects/avr32/src/contrib/gcc/doc/extend.texi#2 integrate
.. //depot/projects/avr32/src/contrib/gdtoa/test/Q.ou0#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/Q.ou1#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/Qtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/README#3 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/d.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dI.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dIsi.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dItest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dd.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/ddsi.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/ddtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dt.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/dtst.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/f.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/ftest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/getround.c#3 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/makefile#3 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/obad/strtodt.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/obad/xL.out#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/rtestnos#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtoIdSI.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtoIddSI.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtodISI.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtodt.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtopddSI.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/strtorddSI.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/testnos#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/testnos1#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/testnos3#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/x.ou0#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/x.ou1#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xL.ou0#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xL.ou1#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xLtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xQtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xsum0.out#3 delete
.. //depot/projects/avr32/src/contrib/gdtoa/test/xtest.c#2 delete
.. //depot/projects/avr32/src/contrib/gdtoa/xsum0.out#3 delete
.. //depot/projects/avr32/src/contrib/hostapd/COPYING#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ChangeLog#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/FREEBSD-Xlist#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/FREEBSD-upgrade#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/Makefile#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/README#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/accounting.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/accounting.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/aes.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/aes.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/aes_wrap.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/aes_wrap.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ap.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ap_list.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ap_list.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/beacon.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/beacon.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/build_config.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/config.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/config.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/config_types.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/crypto.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/crypto.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ctrl_iface.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ctrl_iface.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/defconfig#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/defs.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/des.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/developer.txt#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/code_structure.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/doxygen.fast#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/doxygen.full#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/eap.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/hostapd.fig#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/mainpage.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/doc/porting.doxygen#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/driver.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/driver_test.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_aka.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_defs.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_gpsk.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_gpsk_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_gpsk_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_gtc.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_i.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_identity.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_md5.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_methods.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_methods.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_mschapv2.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_pax.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_pax_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_pax_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_peap.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_psk.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_psk_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_psk_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sake.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sake_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sake_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sim.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sim_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sim_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sim_db.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_sim_db.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_tls.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_tls_common.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_tls_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_tlv.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_ttls.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_ttls.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eap_vendor_test.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eapol_sm.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eapol_sm.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eloop.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eloop.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eloop_none.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/eloop_win.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hlr_auc_gw.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostap_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.8#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.accept#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.conf#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.deny#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.eap_user#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.radius_clients#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.sim_db#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.vlan#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd.wpa_psk#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd_cli.1#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hostapd_cli.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hw_features.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/hw_features.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/iapp.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/iapp.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11_auth.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11_auth.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11h.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_11h.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_1x.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ieee802_1x.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/includes.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/l2_packet.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/l2_packet_none.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/logwatch/README#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/logwatch/hostapd#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/logwatch/hostapd.conf#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/madwifi.conf#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/md4.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/md5.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/md5.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/milenage.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/milenage.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/mlme.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/mlme.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ms_funcs.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/ms_funcs.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/os.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/os_internal.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/os_none.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/os_unix.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/pmksa_cache.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/pmksa_cache.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/preauth.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/preauth.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius_client.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius_client.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius_server.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/radius_server.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/rc4.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/rc4.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/reconfig.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sha1.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sha1.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sha256.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sha256.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sta_info.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/sta_info.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/state_machine.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/tls.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/tls_gnutls.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/tls_none.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/tls_openssl.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/version.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/vlan_init.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/vlan_init.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wired.conf#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wme.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wme.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wpa.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wpa.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wpa_common.h#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wpa_ctrl.c#2 delete
.. //depot/projects/avr32/src/contrib/hostapd/wpa_ctrl.h#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/FILES#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/FREEBSD-Xlist#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/README#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/README.Win32#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.aix#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.dag#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.hpux#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.linux#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.macosx#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.septel#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/README.tru64#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/acsite.m4#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/atmuni31.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/bpf_dump.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/chmod_bpf#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/configure#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/dlpisubs.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/dlpisubs.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/doc/pcap.html#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/doc/pcap.txt#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/doc/pcap.xml#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/etherent.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/ethertype.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/fad-gifc.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/fad-glifc.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/fad-sita.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/filtertest.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/findalldevstest.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/ieee80211.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/missing/snprintf.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/mkdep#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/net/bpf_filter.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/packaging/pcap.spec.in#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-bpf.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-bt-linux.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-bt-linux.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-config.1#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-config.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-dag.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-dos.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-enet.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-filter.manmisc#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-filter.manmisc.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-int.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-libdlpi.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-linktype.manmisc#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-linktype.manmisc.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-namedb.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-nit.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-nit.h#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/pcap-null.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-pf.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-pf.h#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/pcap-savefile.manfile#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-savefile.manfile.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-septel.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-septel.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-sita.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-sita.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-sita.html#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-snit.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-snoop.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-stdinc.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap-usb-linux.c#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-usb-linux.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap.3#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/pcap.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/pcap/bluetooth.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/bpf.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/namedb.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/pcap.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/sll.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/usb.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap/vlan.h#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap1.h#2 delete
.. //depot/projects/avr32/src/contrib/libpcap/pcap_activate.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_breakloop.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_close.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_compile.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_compile.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_create.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_datalink.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_datalink.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_close.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_file.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_flush.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_open.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_file.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_fileno.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_findalldevs.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_freealldevs.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_freecode.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_geterr.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_inject.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_is_swapped.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_lib_version.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_lookupdev.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_lookupnet.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_loop.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_major_version.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_next_ex.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_offline_filter.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_open_dead.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_open_live.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_open_offline.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_datalink.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_promisc.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_set_timeout.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_setdirection.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_setfilter.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_setnonblock.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_snapshot.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_stats.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_statustostr.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/pcap_strerror.3pcap#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/runlex.sh#1 branch
.. //depot/projects/avr32/src/contrib/libpcap/savefile.c#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/avr32/src/contrib/libpcap/sll.h#2 delete
.. //depot/projects/avr32/src/contrib/openbsm/CREDITS#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/NEWS#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/README#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bin/audit/audit.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bsm/auditd_lib.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/bsm/libbsm.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/configure#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/etc/audit_control#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/au_control.3#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/au_domain.3#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/au_errno.3#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/man/audit_control.5#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/man/auditon.2#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/avr32/src/contrib/openbsm/tools/audump.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/FILES#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/FREEBSD-Xlist#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/INSTALL#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/INSTALL.txt#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/Makefile-devel-adds#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/PLATFORMS#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/README#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/Readme.Win32#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/TODO#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/addrtoname.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/af.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/af.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/aodv.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/appletalk.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/arcnet.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/atm.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/atmuni31.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/bgp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/bpf_dump.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/chdlc.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/checksum.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/configure#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/decnet.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/enc.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ether.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ethertype.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/extract.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/fddi.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/gmpls.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/gmpls.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/gmt2local.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/gmt2local.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/icmp6.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ieee802_11_radio.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/igrp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ip6.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ipfc.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ipproto.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ipproto.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ipsec_doi.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ipx.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/isakmp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/l2tp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/l2vpn.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/l2vpn.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/lane.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/lbl/os-osf4.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/lbl/os-solaris2.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/lbl/os-sunos4.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/lbl/os-ultrix4.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/machdep.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/machdep.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/makemib#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/addrinfo.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/datalinks.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/dlnames.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/getaddrinfo.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/getnameinfo.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/inet_aton.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/inet_ntop.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/inet_pton.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/snprintf.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/strdup.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/strlcat.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/strlcpy.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/missing/strsep.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/mpls.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/netbios.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/nfs.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/nfsfh.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/nlpid.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/nlpid.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ntp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/oakley.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ospf6.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/oui.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/oui.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/pcap-missing.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/pcap_dump_ftell.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/pmap_prot.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/ppp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ah.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-aodv.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ap1394.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-arcnet.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-arp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ascii.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-atalk.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-beep.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-bgp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-bt.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-cdp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-cfm.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-cip.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-cnfp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-decnet.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-dtp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-dvmrp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-eap.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-egp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-eigrp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-enc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-esp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-frag6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-gre.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-hsrp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-icmp6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-igmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-igrp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ip6opts.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ipcomp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ipx.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-isakmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-krb.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-lldp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-lwapp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-lwres.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-mobile.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-mobility.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-mpcp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-mpls.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-msdp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-netbios.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ntp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ospf6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-pgm.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-pppoe.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-radius.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-raw.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-rip.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-ripng.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-rrcp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-rt6.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sflow.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-sip.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sl.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-slow.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-snmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-stp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sunatm.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-sunrpc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-symantec.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-syslog.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-telnet.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-timed.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-udld.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-vjc.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-vqp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-vrrp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-vtp.c#1 branch
.. //depot/projects/avr32/src/contrib/tcpdump/print-wb.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/print-zephyr.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/route6d.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/rpc_auth.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/rpc_msg.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/rx.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/sctpConstants.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/sctpHeader.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/setsignal.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/setsignal.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/slcompress.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/slip.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/sll.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/smb.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/strcasecmp.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/telnet.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/tests/.cvsignore#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/alltests.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/eapon1.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/eapon1.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/eapon1.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/eapon1.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/eapon2.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp-secrets.txt#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp0.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp0.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp1.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp1.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp1.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp2.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp2.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp2.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp3.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp3.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp4.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp4.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp5.gdbinit#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp5.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/esp5.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/espudp1.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/espudp1.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/espudp1.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp1.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp1.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp2.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp2.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp3.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp3.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp4.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp4.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/isakmp4500.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/lmp.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/lmp.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/lmp.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/mpls-ldp-hello.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/ospf-gmpls.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/ospf-gmpls.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/ospf-gmpls.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-A.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-AA.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-X.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-XX.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-capX.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-capXX.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-flags.puu#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-flags.sh#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-x.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tests/print-xx.out#2 delete
.. //depot/projects/avr32/src/contrib/tcpdump/tftp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/timed.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/token.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/avr32/src/contrib/tcpdump/vfprintf.c#2 integrate
.. //depot/projects/avr32/src/contrib/top/install#2 delete
.. //depot/projects/avr32/src/contrib/top/install-sh#1 branch
.. //depot/projects/avr32/src/contrib/wpa/COPYING#1 branch
.. //depot/projects/avr32/src/contrib/wpa/README#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ChangeLog#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/README#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/README-WPS#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/accounting.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/accounting.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ap.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ap_list.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ap_list.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/beacon.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/beacon.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/config.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/config.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ctrl_iface.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ctrl_iface.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/defconfig#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/doxygen.fast#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/doxygen.full#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/eap.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/hostapd.fig#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/doc/porting.doxygen#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/driver.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/drivers.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/eap_testing.txt#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/eapol_sm.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/eapol_sm.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostap_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.8#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.accept#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.conf#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.deny#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.eap_user#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.radius_clients#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.sim_db#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.vlan#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd_cli.1#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hostapd_cli.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hw_features.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/hw_features.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/iapp.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/iapp.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_11.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_11.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_1x.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/ieee802_1x.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/logwatch/README#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/logwatch/hostapd#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/mlme.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/mlme.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/nt_password_hash.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/peerkey.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/pmksa_cache.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/pmksa_cache.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/preauth.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/preauth.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/sta_info.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/sta_info.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/vlan_init.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/vlan_init.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wired.conf#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wme.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wme.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa_auth_i.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wpa_ft.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wps_hostapd.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/hostapd/wps_hostapd.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/defs.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/eapol_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/ieee802_11_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/ieee802_11_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/ieee802_11_defs.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/privsep_commands.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/version.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/wpa_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/wpa_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/wpa_ctrl.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/common/wpa_ctrl.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/aes.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/aes.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/aes_wrap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/aes_wrap.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_internal.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_none.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/crypto_openssl.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/des.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/dh_groups.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/dh_groups.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/md4.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/md5.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/md5.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/ms_funcs.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/ms_funcs.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/rc4.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/rc4.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/sha1.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/sha1.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/sha256.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/sha256.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls_gnutls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls_internal.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls_none.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls_openssl.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/crypto/tls_schannel.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/drivers/driver.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/drivers/driver_ndis.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/drivers/driver_ndis.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/drivers/drivers.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/drivers/scan_helpers.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/chap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/chap.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_defs.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_ttls.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/ikev2_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_common/ikev2_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_aka.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_config.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_fast.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_i.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_leap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_md5.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_methods.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_methods.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_otp.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_pax.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_peap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_psk.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_sake.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_sim.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_tls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/ikev2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/ikev2.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/mschapv2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/mschapv2.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/tncc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_peer/tncc.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_aka.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_fast.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_gtc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_i.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_identity.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_md5.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_methods.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_methods.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_pax.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_peap.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_psk.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_sake.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_sim.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_tls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_tnc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_ttls.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/eap_wsc.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/ikev2.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/ikev2.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/tncs.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eap_server/tncs.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eapol_supp/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eapol_supp/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/l2_packet/l2_packet.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius_client.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius_client.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius_server.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/radius/radius_server.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/peerkey.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/peerkey.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/preauth.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/preauth.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa_ft.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa_i.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa_ie.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/rsn_supp/wpa_ie.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/.gitignore#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/Makefile#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/asn1.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/asn1.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/asn1_test.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/bignum.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/bignum.h#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/libtommath.c#1 branch
.. //depot/projects/avr32/src/contrib/wpa/src/tls/rsa.c#1 branch

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

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 14:59:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5354E1065691; Tue, 31 Mar 2009 14:59:45 +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 F408A106568F
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:59:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C6D198FC19
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:59:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VExiXP014272
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 14:59:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VExiVh014270
	for perforce@freebsd.org; Tue, 31 Mar 2009 14:59:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 31 Mar 2009 14:59:44 GMT
Message-Id: <200903311459.n2VExiVh014270@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160056 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: Tue, 31 Mar 2009 14:59:46 -0000

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

Change 160056 by hselasky@hselasky_laptop001 on 2009/03/31 14:59:03

	USB core:
	  - remove code for unused and unlikely quirk, "uq_power_claim"

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#22 (text+ko) ====

@@ -431,7 +431,6 @@
 usb2_set_config_index(struct usb2_device *udev, uint8_t index)
 {
 	struct usb2_status ds;
-	struct usb2_hub_descriptor hd;
 	struct usb2_config_descriptor *cdp;
 	uint16_t power;
 	uint16_t max_power;
@@ -484,38 +483,16 @@
 		/* May be self powered. */
 		if (cdp->bmAttributes & UC_BUS_POWERED) {
 			/* Must ask device. */
-			if (udev->flags.uq_power_claim) {
-				/*
-				 * HUB claims to be self powered, but isn't.
-				 * It seems that the power status can be
-				 * determined by the HUB characteristics.
-				 */
-				err = usb2_req_get_hub_descriptor
-				    (udev, NULL, &hd, 1);
-				if (err) {
-					DPRINTFN(0, "could not read "
-					    "HUB descriptor: %s\n",
-					    usb2_errstr(err));
-
-				} else if (UGETW(hd.wHubCharacteristics) &
-				    UHD_PWR_INDIVIDUAL) {
-					selfpowered = 1;
-				}
-				DPRINTF("characteristics=0x%04x\n",
-				    UGETW(hd.wHubCharacteristics));
-			} else {
-				err = usb2_req_get_device_status
-				    (udev, NULL, &ds);
-				if (err) {
-					DPRINTFN(0, "could not read "
-					    "device status: %s\n",
-					    usb2_errstr(err));
-				} else if (UGETW(ds.wStatus) & UDS_SELF_POWERED) {
-					selfpowered = 1;
-				}
-				DPRINTF("status=0x%04x \n",
-				    UGETW(ds.wStatus));
+			err = usb2_req_get_device_status(udev, NULL, &ds);
+			if (err) {
+				DPRINTFN(0, "could not read "
+				    "device status: %s\n",
+				    usb2_errstr(err));
+			} else if (UGETW(ds.wStatus) & UDS_SELF_POWERED) {
+				selfpowered = 1;
 			}
+			DPRINTF("status=0x%04x \n",
+				UGETW(ds.wStatus));
 		} else
 			selfpowered = 1;
 	}
@@ -1633,9 +1610,6 @@
 	if (usb2_test_quirk(&uaa, UQ_BUS_POWERED)) {
 		udev->flags.uq_bus_powered = 1;
 	}
-	if (usb2_test_quirk(&uaa, UQ_POWER_CLAIM)) {
-		udev->flags.uq_power_claim = 1;
-	}
 	if (usb2_test_quirk(&uaa, UQ_NO_STRINGS)) {
 		udev->flags.no_strings = 1;
 	}

==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#14 (text+ko) ====

@@ -90,7 +90,6 @@
 					 * strings */
 	uint8_t	remote_wakeup:1;	/* set if remote wakeup is enabled */
 	uint8_t	uq_bus_powered:1;	/* set if BUS powered quirk is present */
-	uint8_t	uq_power_claim:1;	/* set if power claim quirk is present */
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 15:14:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1123310656FB; Tue, 31 Mar 2009 15:14:00 +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 B0AF310656F5
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:13:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 836EF8FC1A
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:13:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VFDxol016335
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:13:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VFDxb6016333
	for perforce@freebsd.org; Tue, 31 Mar 2009 15:13:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 15:13:59 GMT
Message-Id: <200903311513.n2VFDxb6016333@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160057 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: Tue, 31 Mar 2009 15:14:02 -0000

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

Change 160057 by trasz@trasz_victim7 on 2009/03/31 15:13:58

	Fix build.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#38 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#38 (text+ko) ====

@@ -1088,7 +1088,7 @@
 
 		/* Disallow unimplemented flags. */
 		if (entry->ae_flags & (ACL_ENTRY_SUCCESSFUL_ACCESS |
-		    ACL_ENTRY_FAILED_ACCESS | ACL_ENTRY_INHERITED))
+		    ACL_ENTRY_FAILED_ACCESS))
 			return (EINVAL);
 
 		/* Disallow flags not allowed for ordinary files. */

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 15:17:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1641D1065672; Tue, 31 Mar 2009 15:17:03 +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 CA48B106564A
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:17:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B8BE38FC14
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:17:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VFH2Kc016596
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:17:02 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VFH284016594
	for perforce@freebsd.org; Tue, 31 Mar 2009 15:17:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 15:17:02 GMT
Message-Id: <200903311517.n2VFH284016594@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160058 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: Tue, 31 Mar 2009 15:17:03 -0000

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

Change 160058 by trasz@trasz_victim7 on 2009/03/31 15:16:22

	Shrink 'struct acl' somewhat.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#29 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#29 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 /* 
  * Developed by the TrustedBSD Project.
- * Support for POSIX.1e access control lists.
+ * Support for POSIX.1e and NFSv4 access control lists.
  */
 
 #ifndef _SYS_ACL_H_
@@ -87,13 +87,13 @@
 /*
  * Current "struct acl".
  */
-typedef int	acl_tag_t;
-typedef int	acl_flag_t;
-typedef int	acl_perm_t;
-typedef int	acl_extended_t;
-typedef int	acl_type_t;
-typedef int	*acl_permset_t;
-typedef int	*acl_flagset_t;
+typedef uint32_t	acl_tag_t;
+typedef uint32_t	acl_perm_t;
+typedef uint16_t	acl_extended_t;
+typedef uint16_t	acl_flag_t;
+typedef int		acl_type_t;
+typedef int		*acl_permset_t;
+typedef int		*acl_flagset_t;
 
 struct acl_entry {
 	acl_tag_t	ae_tag;
@@ -163,10 +163,10 @@
 /*
  * Possible valid values for ae_extended field.
  */
-#define	ACL_EXTENDED_ALLOW	0x00000100
-#define	ACL_EXTENDED_DENY	0x00000200
-#define	ACL_EXTENDED_AUDIT	0x00000400
-#define	ACL_EXTENDED_ALARM	0x00000800
+#define	ACL_EXTENDED_ALLOW	0x0100
+#define	ACL_EXTENDED_DENY	0x0200
+#define	ACL_EXTENDED_AUDIT	0x0400
+#define	ACL_EXTENDED_ALARM	0x0800
 
 /*
  * Possible valid values for acl_type_t arguments.  First two
@@ -179,7 +179,7 @@
 #define	ACL_TYPE_NFS4		0x00000004
 
 /*
- * Possible flags in ae_perm field for POSIX ACLs.
+ * Possible flags in ae_perm field for POSIX.1e ACLs.
  */
 #define	ACL_EXECUTE		0x0001
 #define	ACL_WRITE		0x0002
@@ -212,10 +212,11 @@
 #define	ACL_WRITE_OWNER		0x10000000
 #define	ACL_SYNCHRONIZE		0x20000000
 
-#define	ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \
-    ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | ACL_EXECUTE | ACL_DELETE_CHILD | \
-    ACL_READ_ATTRIBUTES | ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | \
-    ACL_WRITE_ACL | ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
+#define	ACL_NFS4_PERM_BITS	(ACL_READ_DATA | ACL_WRITE_DATA | \
+    ACL_APPEND_DATA | ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | \
+    ACL_EXECUTE | ACL_DELETE_CHILD | ACL_READ_ATTRIBUTES | \
+    ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | ACL_WRITE_ACL | \
+    ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
 
 /*
  * Possible entry_id values for acl_get_entry(3).
@@ -226,15 +227,16 @@
 /*
  * Possible values in ae_flags field; valid only for NFSv4 ACLs.
  */
-#define	ACL_ENTRY_FILE_INHERIT		0x00000001
-#define	ACL_ENTRY_DIRECTORY_INHERIT	0x00000002
-#define	ACL_ENTRY_LIMIT_INHERIT		0x00000004 /* "NO_PROPAGATE_INHERIT" */
-#define	ACL_ENTRY_ONLY_INHERIT		0x00000008 /* "INHERIT_ONLY" */
-#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x00000010
-#define	ACL_ENTRY_FAILED_ACCESS		0x00000020
+#define	ACL_ENTRY_FILE_INHERIT		0x0001
+#define	ACL_ENTRY_DIRECTORY_INHERIT	0x0002
+#define	ACL_ENTRY_LIMIT_INHERIT		0x0004 /* "NO_PROPAGATE_INHERIT" */
+#define	ACL_ENTRY_ONLY_INHERIT		0x0008 /* "INHERIT_ONLY" */
+#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x0010
+#define	ACL_ENTRY_FAILED_ACCESS		0x0020
 
-#define	ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \
-    ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \
+#define	ACL_FLAGS_BITS			(ACL_ENTRY_FILE_INHERIT | \
+    ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_LIMIT_INHERIT | \
+    ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \
     ACL_ENTRY_FAILED_ACCESS)
 
 /*

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 15:21:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9EF91065670; Tue, 31 Mar 2009 15:21:07 +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 8948A106566B
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:21:07 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 75A3D8FC0A
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:21:07 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VFL7Wj016933
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:21:07 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VFL6GW016931
	for perforce@freebsd.org; Tue, 31 Mar 2009 15:21:06 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 15:21:06 GMT
Message-Id: <200903311521.n2VFL6GW016931@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160059 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: Tue, 31 Mar 2009 15:21:08 -0000

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

Change 160059 by trasz@trasz_victim7 on 2009/03/31 15:20:40

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ipfw#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/dlfcn.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/mpool.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/README#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/Symbol.map#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_debug.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_open.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_page.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_put.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_split.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/db/db.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/README#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_bigkey.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_buf.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_func.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_log2.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_page.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/man/mpool.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/mpool/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/mpool/mpool-compat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/mpool/mpool.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/recno/rec_close.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/recno/rec_put.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/gets.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/gvinum/gvinum.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/gvinum/gvinum.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/lagg.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ATTRIB.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_CREATE.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_INACTIVE.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_IOCTL.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_LINK.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_LOCK.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_LOOKUP.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_OPENCLOSE.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_RDWR.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_READDIR.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_READLINK.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_REMOVE.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_RENAME.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_VPTOCNP.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/refcount.9#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CAMBRIA#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#34 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_agereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-ahci.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-promise.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-sis.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_cp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/ax88x90reg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_wd80x3.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/malo/if_malo_pci.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/usb_wlan.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_ebr.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_mbr.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_list.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rename.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_share.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#29 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/bus.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ath/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/geom/geom_vinum/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mii/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/tools/vnode_if.awk#3 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.15 2009/03/21 22:58:08 rpaulo Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.16 2009/03/31 11:04:51 rpaulo Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL)
  */
 
@@ -53,10 +53,6 @@
 
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define PCAP_VERSION_MAJOR 2
 #define PCAP_VERSION_MINOR 4
 

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ipfw#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.19 2009/03/30 21:31:52 emax Exp $
 #
 
 # PROVIDE: ipfw
@@ -23,10 +23,20 @@
 	if checkyesno dummynet_enable; then
 		required_modules="$required_modules dummynet"
 	fi
+
+	if checkyesno firewall_nat_enable; then
+		if ! checkyesno natd_enable; then
+			required_modules="$required_modules ipfw_nat"
+		fi
+	fi 
 }
 
 ipfw_start()
 {
+	local   _firewall_type
+
+	_firewall_type=$1 
+
 	# set the firewall rules script if none was specified
 	[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
 
@@ -34,7 +44,7 @@
 		if [ -f /etc/rc.d/natd ] ; then
 			/etc/rc.d/natd quietstart
 		fi
-		/bin/sh "${firewall_script}"
+		/bin/sh "${firewall_script}" "${_firewall_type}"
 		echo 'Firewall rules loaded.'
 	elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then
 		echo 'Warning: kernel has firewall functionality, but' \
@@ -67,4 +77,4 @@
 }
 
 load_rc_config $name
-run_rc_command "$1"
+run_rc_command $*

==== //depot/projects/soc2008/trasz_nfs4acl/include/dlfcn.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $
+ * $FreeBSD: src/include/dlfcn.h,v 1.21 2009/03/30 08:47:28 kib Exp $
  */
 
 #ifndef _DLFCN_H_
@@ -47,6 +47,7 @@
 #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
 #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
 #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
+#define	RTLD_NODELETE	0x01000	/* Do not remove members. */
 
 /*
  * Request arguments for dlinfo().

==== //depot/projects/soc2008/trasz_nfs4acl/include/mpool.h#2 (text+ko) ====

@@ -30,8 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)mpool.h	8.2 (Berkeley) 7/14/94
- * $FreeBSD: src/include/mpool.h,v 1.9 2002/03/23 17:24:53 imp Exp $
+ *	@(#)mpool.h	8.4 (Berkeley) 11/2/95
+ * $FreeBSD: src/include/mpool.h,v 1.10 2009/03/28 07:31:02 delphij Exp $
  */
 
 #ifndef _MPOOL_H_
@@ -47,7 +47,7 @@
  * pool is handed an opaque MPOOL cookie which stores all of this information.
  */
 #define	HASHSIZE	128
-#define	HASHKEY(pgno)	((pgno - 1) % HASHSIZE)
+#define	HASHKEY(pgno)	((pgno - 1 + HASHSIZE) % HASHSIZE)
 
 /* The BKT structures are the elements of the queues. */
 typedef struct _bkt {
@@ -58,6 +58,7 @@
 
 #define	MPOOL_DIRTY	0x01		/* page needs to be written */
 #define	MPOOL_PINNED	0x02		/* page is pinned into memory */
+#define	MPOOL_INUSE	0x04		/* page address is valid */
 	u_int8_t flags;			/* flags */
 } BKT;
 
@@ -68,7 +69,7 @@
 	pgno_t	curcache;		/* current number of cached pages */
 	pgno_t	maxcache;		/* max number of cached pages */
 	pgno_t	npages;			/* number of pages in the file */
-	u_long	pagesize;		/* file page size */
+	unsigned long	pagesize;	/* file page size */
 	int	fd;			/* file descriptor */
 					/* page in conversion routine */
 	void    (*pgin)(void *, pgno_t, void *);
@@ -76,25 +77,32 @@
 	void    (*pgout)(void *, pgno_t, void *);
 	void	*pgcookie;		/* cookie for page in/out routines */
 #ifdef STATISTICS
-	u_long	cachehit;
-	u_long	cachemiss;
-	u_long	pagealloc;
-	u_long	pageflush;
-	u_long	pageget;
-	u_long	pagenew;
-	u_long	pageput;
-	u_long	pageread;
-	u_long	pagewrite;
+	unsigned long	cachehit;
+	unsigned long	cachemiss;
+	unsigned long	pagealloc;
+	unsigned long	pageflush;
+	unsigned long	pageget;
+	unsigned long	pagenew;
+	unsigned long	pageput;
+	unsigned long	pageread;
+	unsigned long	pagewrite;
 #endif
 } MPOOL;
 
+#define	MPOOL_IGNOREPIN	0x01		/* Ignore if the page is pinned. */
+#define	MPOOL_PAGE_REQUEST	0x01	/* Allocate a new page with a
+					   specific page number. */
+#define	MPOOL_PAGE_NEXT		0x02	/* Allocate a new page with the next
+					  page number. */
+
 __BEGIN_DECLS
 MPOOL	*mpool_open(void *, int, pgno_t, pgno_t);
 void	 mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
 	    void (*)(void *, pgno_t, void *), void *);
-void	*mpool_new(MPOOL *, pgno_t *);
-void	*mpool_get(MPOOL *, pgno_t, u_int);
-int	 mpool_put(MPOOL *, void *, u_int);
+void	*mpool_new(MPOOL *, pgno_t *, unsigned int);
+void	*mpool_get(MPOOL *, pgno_t, unsigned int);
+int	 mpool_delete(MPOOL *, void *);
+int	 mpool_put(MPOOL *, void *, unsigned int);
 int	 mpool_sync(MPOOL *);
 int	 mpool_close(MPOOL *);
 #ifdef STATISTICS

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/README#2 (text+ko) ====

@@ -1,4 +1,5 @@
 #	@(#)README	8.27 (Berkeley) 9/1/94
+# $FreeBSD: src/lib/libc/db/README,v 1.2 2009/03/28 04:00:46 delphij Exp $
 
 This is version 1.85 of the Berkeley DB code.
 
@@ -31,10 +32,3 @@
 recno		The fixed/variable length record routines.
 test		Test package.
 
-============================================
-Debugging:
-
-If you're running a memory checker (e.g. Purify) on DB, make sure that
-you recompile it with "-DPURIFY" in the CFLAGS, first.  By default,
-allocated pages are not initialized by the DB code, and they will show
-up as reads of uninitialized memory in the buffer write routines.

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/Symbol.map#2 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/db/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/db/Symbol.map,v 1.3 2009/03/28 07:31:02 delphij Exp $
  */
 
 FBSD_1.0 {
@@ -16,7 +16,6 @@
 	dbm_dirfno;
 	mpool_open;
 	mpool_filter;
-	mpool_new;
 	mpool_get;
 	mpool_put;
 	mpool_close;
@@ -24,6 +23,11 @@
 	mpool_stat;
 };
 
+FBSD_1.1 {
+	mpool_new;
+	mpool_delete;
+};
+
 FBSDprivate_1.0 {
 	__bt_open;
 	__dbpanic;

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_debug.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.6 2009/03/23 23:22:09 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.7 2009/03/28 07:31:02 delphij Exp $");
 
 #include <sys/param.h>
 
@@ -83,10 +83,9 @@
 	}
 #undef X
 
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
+	for (i = P_ROOT;
+	    (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i)
 		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
 }
 
 /*
@@ -135,10 +134,8 @@
 	PAGE *h;
 
 	t = dbp->internal;
-	if ((h = mpool_get(t->bt_mp, pgno, 0)) != NULL) {
+	if ((h = mpool_get(t->bt_mp, pgno, MPOOL_IGNOREPIN)) != NULL)
 		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
 }
 
 /*
@@ -257,7 +254,8 @@
 	t = dbp->internal;
 	pcont = pinternal = pleaf = 0;
 	nkeys = ifree = lfree = 0;
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
+	for (i = P_ROOT;
+	    (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i)
 		switch (h->flags & P_TYPE) {
 		case P_BINTERNAL:
 		case P_RINTERNAL:
@@ -274,22 +272,18 @@
 			++pcont;
 			break;
 		}
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
 
 	/* Count the levels of the tree. */
 	for (i = P_ROOT, levels = 0 ;; ++levels) {
-		h = mpool_get(t->bt_mp, i, 0);
+		h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN);
 		if (h->flags & (P_BLEAF|P_RLEAF)) {
 			if (levels == 0)
 				levels = 1;
-			(void)mpool_put(t->bt_mp, h, 0);
 			break;
 		}
 		i = F_ISSET(t, R_RECNO) ?
 		    GETRINTERNAL(h, 0)->pgno :
 		    GETBINTERNAL(h, 0)->pgno;
-		(void)mpool_put(t->bt_mp, h, 0);
 	}
 
 	(void)fprintf(stderr, "%d level%s with %lu keys",

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_open.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.15 2009/03/23 23:43:07 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.18 2009/03/28 07:31:02 delphij Exp $");
 
 /*
  * Implementation of btree access method for 4.4BSD.
@@ -156,9 +156,8 @@
 		goto einval;
 
 	/* Allocate and initialize DB and BTREE structures. */
-	if ((t = (BTREE *)malloc(sizeof(BTREE))) == NULL)
+	if ((t = (BTREE *)calloc(1, sizeof(BTREE))) == NULL)
 		goto err;
-	memset(t, 0, sizeof(BTREE));
 	t->bt_fd = -1;			/* Don't close unopened fd on error. */
 	t->bt_lorder = b.lorder;
 	t->bt_order = NOT;
@@ -166,9 +165,8 @@
 	t->bt_pfx = b.prefix;
 	t->bt_rfd = -1;
 
-	if ((t->bt_dbp = dbp = (DB *)malloc(sizeof(DB))) == NULL)
+	if ((t->bt_dbp = dbp = (DB *)calloc(1, sizeof(DB))) == NULL)
 		goto err;
-	memset(t->bt_dbp, 0, sizeof(DB));
 	if (t->bt_lorder != machine_lorder)
 		F_SET(t, B_NEEDSWAP);
 
@@ -354,18 +352,25 @@
 	PAGE *meta, *root;
 	pgno_t npg;
 
-	if ((meta = mpool_get(t->bt_mp, 0, 0)) != NULL) {
-		mpool_put(t->bt_mp, meta, 0);
-		return (RET_SUCCESS);
+	if ((root = mpool_get(t->bt_mp, 1, 0)) != NULL) {
+		if (root->lower == 0 &&
+		    root->pgno == 0 &&
+		    root->linp[0] == 0) {
+			mpool_delete(t->bt_mp, root);
+			errno = EINVAL;
+		} else {
+			mpool_put(t->bt_mp, root, 0);
+			return (RET_SUCCESS);
+		}
 	}
 	if (errno != EINVAL)		/* It's OK to not exist. */
 		return (RET_ERROR);
 	errno = 0;
 
-	if ((meta = mpool_new(t->bt_mp, &npg)) == NULL)
+	if ((meta = mpool_new(t->bt_mp, &npg, MPOOL_PAGE_NEXT)) == NULL)
 		return (RET_ERROR);
 
-	if ((root = mpool_new(t->bt_mp, &npg)) == NULL)
+	if ((root = mpool_new(t->bt_mp, &npg, MPOOL_PAGE_NEXT)) == NULL)
 		return (RET_ERROR);
 
 	if (npg != P_ROOT)
@@ -385,14 +390,18 @@
 tmp(void)
 {
 	sigset_t set, oset;
-	int fd;
+	int fd, len;
 	char *envtmp = NULL;
 	char path[MAXPATHLEN];
 
 	if (issetugid() == 0)
 		envtmp = getenv("TMPDIR");
-	(void)snprintf(path,
+	len = snprintf(path,
 	    sizeof(path), "%s/bt.XXXXXXXXXX", envtmp ? envtmp : "/tmp");
+	if (len < 0 || len >= (int)sizeof(path)) {
+		errno = ENAMETOOLONG;
+		return(-1);
+	}
 
 	(void)sigfillset(&set);
 	(void)_sigprocmask(SIG_BLOCK, &set, &oset);

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_page.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.5 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.6 2009/03/28 07:31:02 delphij Exp $");
 
 #include <sys/types.h>
 
@@ -90,5 +90,5 @@
 		F_SET(t, B_METADIRTY);
 		return (h);
 	}
-	return (mpool_new(t->bt_mp, npg));
+	return (mpool_new(t->bt_mp, npg, MPOOL_PAGE_NEXT));
 }

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_put.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.8 2009/03/04 00:58:04 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.9 2009/03/28 05:45:29 delphij Exp $");
 
 #include <sys/types.h>
 
@@ -197,7 +197,7 @@
 	 * into the offset array, shift the pointers up.
 	 */
 	nbytes = NBLEAFDBT(key->size, data->size);
-	if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
+	if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
 		if ((status = __bt_split(t, h, key,
 		    data, dflags, nbytes, idx)) != RET_SUCCESS)
 			return (status);
@@ -278,7 +278,7 @@
 	 * have to search to get split stack.
 	 */
 	nbytes = NBLEAFDBT(key->size, data->size);
-	if (h->upper - h->lower < nbytes + sizeof(indx_t))
+	if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t))
 		goto miss;
 
 	if (t->bt_order == FORWARD) {

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_split.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.10 2009/03/04 00:58:04 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.12 2009/03/28 05:45:29 delphij Exp $");
 
 #include <sys/types.h>
 
@@ -205,7 +205,7 @@
 		}
 
 		/* Split the parent page if necessary or shift the indices. */
-		if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
+		if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
 			sp = h;
 			h = h->pgno == P_ROOT ?
 			    bt_root(t, h, &l, &r, &skip, nbytes) :
@@ -372,13 +372,10 @@
 	}
 
 	/* Put the new left page for the split into place. */
-	if ((l = (PAGE *)malloc(t->bt_psize)) == NULL) {
+	if ((l = (PAGE *)calloc(1, t->bt_psize)) == NULL) {
 		mpool_put(t->bt_mp, r, 0);
 		return (NULL);
 	}
-#ifdef PURIFY
-	memset(l, 0xff, t->bt_psize);
-#endif
 	l->pgno = h->pgno;
 	l->nextpg = r->pgno;
 	l->prevpg = h->prevpg;

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/db/db.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/db/db.c,v 1.4 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/db/db.c,v 1.5 2009/03/28 07:26:00 delphij Exp $");
 
 #include <sys/types.h>
 
@@ -50,8 +50,8 @@
 
 #define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
 #define	USE_OPEN_FLAGS							\
-	(O_CREAT | O_EXCL | O_EXLOCK | O_NONBLOCK | O_RDONLY |		\
-	 O_RDWR | O_SHLOCK | O_TRUNC)
+	(O_CREAT | O_EXCL | O_EXLOCK | O_NOFOLLOW | O_NONBLOCK | 	\
+	 O_RDONLY | O_RDWR | O_SHLOCK | O_SYNC | O_TRUNC)
 
 	if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)
 		switch (type) {

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/README#2 (text+ko) ====

@@ -1,4 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 6/4/93
+# $FreeBSD: src/lib/libc/db/hash/README,v 1.2 2009/03/28 07:31:02 delphij Exp $
 
 This package implements a superset of the hsearch and dbm/ndbm libraries.
 
@@ -44,10 +45,6 @@
 
 NOTES:
 
-The file search.h is provided for using the hsearch compatible interface
-on BSD systems.  On System V derived systems, search.h should appear in 
-/usr/include.
-
 The man page ../man/db.3 explains the interface to the hashing system.
 The file hash.ps is a postscript copy of a paper explaining
 the history, implementation, and performance of the hash package.

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.15 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.21 2009/03/28 07:20:39 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -120,25 +120,15 @@
 	 */
 	hashp->flags = flags;
 
-	new_table = 0;
-	if (!file || (flags & O_TRUNC) ||
-	    (stat(file, &statbuf) && (errno == ENOENT))) {
-		if (errno == ENOENT)
-			errno = 0; /* Just in case someone looks at errno */
-		new_table = 1;
-	}
 	if (file) {
 		if ((hashp->fp = _open(file, flags, mode)) == -1)
 			RETURN_ERROR(errno, error0);
+		(void)_fcntl(hashp->fp, F_SETFD, 1);
+		new_table = _fstat(hashp->fp, &statbuf) == 0 &&
+		    statbuf.st_size == 0 && (flags & O_ACCMODE) != O_RDONLY;
+	} else
+		new_table = 1;
 
-		/* if the .db file is empty, and we had permission to create
-		   a new .db file, then reinitialize the database */
-		if ((flags & O_CREAT) &&
-		     _fstat(hashp->fp, &statbuf) == 0 && statbuf.st_size == 0)
-			new_table = 1;
-
-		(void)_fcntl(hashp->fp, F_SETFD, 1);
-	}
 	if (new_table) {
 		if (!(hashp = init_hash(hashp, file, info)))
 			RETURN_ERROR(errno, error1);
@@ -164,7 +154,7 @@
 		if (hashp->VERSION != HASHVERSION &&
 		    hashp->VERSION != OLDHASHVERSION)
 			RETURN_ERROR(EFTYPE, error1);
-		if (hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
+		if ((int32_t)hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
 			RETURN_ERROR(EFTYPE, error1);
 		/*
 		 * Figure out how many segments we need.  Max_Bucket is the
@@ -173,7 +163,6 @@
 		 */
 		nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) /
 			 hashp->SGSIZE;
-		hashp->nsegs = 0;
 		if (alloc_segs(hashp, nsegs))
 			/*
 			 * If alloc_segs fails, table will have been destroyed
@@ -347,8 +336,7 @@
 static int
 init_htab(HTAB *hashp, int nelem)
 {
-	int nbuckets, nsegs;
-	int l2;
+	int nbuckets, nsegs, l2;
 
 	/*
 	 * Divide number of elements by the fill factor and determine a
@@ -428,6 +416,10 @@
 	for (i = 0; i < hashp->nmaps; i++)
 		if (hashp->mapp[i])
 			free(hashp->mapp[i]);
+	if (hashp->tmp_key)
+		free(hashp->tmp_key);
+	if (hashp->tmp_buf)
+		free(hashp->tmp_buf);
 
 	if (hashp->fp != -1)
 		(void)_close(hashp->fp);
@@ -495,8 +487,7 @@
 	whdrp = &whdr;
 	swap_header_copy(&hashp->hdr, whdrp);
 #endif
-	if ((lseek(fp, (off_t)0, SEEK_SET) == -1) ||
-	    ((wsize = _write(fp, whdrp, sizeof(HASHHDR))) == -1))
+	if ((wsize = pwrite(fp, whdrp, sizeof(HASHHDR), (off_t)0)) == -1)
 		return (-1);
 	else
 		if (wsize != sizeof(HASHHDR)) {
@@ -541,8 +532,7 @@
 
 	hashp = (HTAB *)dbp->internal;
 	if (flag && flag != R_NOOVERWRITE) {
-		hashp->error = EINVAL;
-		errno = EINVAL;
+		hashp->error = errno = EINVAL;
 		return (ERROR);
 	}
 	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
@@ -721,7 +711,7 @@
 		hashp->cndx = 1;
 		hashp->cpage = NULL;
 	}
-
+ next_bucket:
 	for (bp = NULL; !bp || !bp[0]; ) {
 		if (!(bufp = hashp->cpage)) {
 			for (bucket = hashp->cbucket;
@@ -736,12 +726,22 @@
 					break;
 			}
 			hashp->cbucket = bucket;
-			if (hashp->cbucket > hashp->MAX_BUCKET) {
+			if ((u_int32_t)hashp->cbucket > hashp->MAX_BUCKET) {
 				hashp->cbucket = -1;
 				return (ABNORMAL);
 			}
-		} else
+		} else {
 			bp = (u_int16_t *)hashp->cpage->page;
+			if (flag == R_NEXT) {
+				hashp->cndx += 2;
+				if (hashp->cndx > bp[0]) {
+					hashp->cpage = NULL;
+					hashp->cbucket++;
+					hashp->cndx = 1;
+					goto next_bucket;
+				}
+			}
+		}
 
 #ifdef DEBUG
 		assert(bp);
@@ -765,17 +765,12 @@
 		if (__big_keydata(hashp, bufp, key, data, 1))
 			return (ERROR);
 	} else {
+		if (hashp->cpage == 0)
+			return (ERROR);
 		key->data = (u_char *)hashp->cpage->page + bp[ndx];
 		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
 		data->data = (u_char *)hashp->cpage->page + bp[ndx + 1];
 		data->size = bp[ndx] - bp[ndx + 1];
-		ndx += 2;
-		if (ndx > bp[0]) {
-			hashp->cpage = NULL;
-			hashp->cbucket++;
-			hashp->cndx = 1;
-		} else
-			hashp->cndx = ndx;
 	}
 	return (SUCCESS);
 }
@@ -858,7 +853,7 @@
 u_int32_t
 __call_hash(HTAB *hashp, char *k, int len)
 {
-	int n, bucket;
+	unsigned int n, bucket;
 
 	n = hashp->hash(k, len);
 	bucket = n & hashp->HIGH_MASK;
@@ -887,15 +882,18 @@
 		errno = save_errno;
 		return (-1);
 	}
+	hashp->nsegs = nsegs;
+	if (nsegs == 0)
+		return (0);
 	/* Allocate segments */
-	if ((store =
-	    (SEGMENT)calloc(nsegs << hashp->SSHIFT, sizeof(SEGMENT))) == NULL) {
+	if ((store = (SEGMENT)calloc(nsegs << hashp->SSHIFT,
+	    sizeof(SEGMENT))) == NULL) {
 		save_errno = errno;
 		(void)hdestroy(hashp);
 		errno = save_errno;
 		return (-1);
 	}
-	for (i = 0; i < nsegs; i++, hashp->nsegs++)
+	for (i = 0; i < nsegs; i++)
 		hashp->dir[i] = &store[i << hashp->SSHIFT];
 	return (0);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.8 2009/03/04 01:17:05 delphij Exp $
+ * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.9 2009/03/28 05:45:29 delphij Exp $
  */
 
 /* Operations */
@@ -71,11 +71,11 @@
 	int32_t		ovfl_point;	/* Where overflow pages are being 
 					 * allocated */
 	int32_t		last_freed;	/* Last overflow page freed */
-	int32_t		max_bucket;	/* ID of Maximum bucket in use */
-	int32_t		high_mask;	/* Mask to modulo into entire table */
-	int32_t		low_mask;	/* Mask to modulo into lower half of 
+	u_int32_t	max_bucket;	/* ID of Maximum bucket in use */
+	u_int32_t	high_mask;	/* Mask to modulo into entire table */
+	u_int32_t	low_mask;	/* Mask to modulo into lower half of 
 					 * table */
-	int32_t		ffactor;	/* Fill factor */
+	u_int32_t	ffactor;	/* Fill factor */
 	int32_t		nkeys;		/* Number of keys in hash table */
 	int32_t		hdrpages;	/* Size of table header */
 	int32_t		h_charkey;	/* value of hash(CHARKEY) */

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_bigkey.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.8 2009/03/04 00:58:04 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.10 2009/03/28 06:47:05 delphij Exp $");
 
 /*
  * PACKAGE: hash
@@ -86,7 +86,8 @@
 __big_insert(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
 {
 	u_int16_t *p;
-	int key_size, n, val_size;
+	int key_size, n;
+	unsigned int val_size;
 	u_int16_t space, move_bytes, off;
 	char *cp, *key_data, *val_data;
 
@@ -117,18 +118,30 @@
 			return (-1);
 		n = p[0];
 		if (!key_size) {
-			if (FREESPACE(p)) {
-				move_bytes = MIN(FREESPACE(p), val_size);
+			space = FREESPACE(p);
+			if (space) {
+				move_bytes = MIN(space, val_size);
+				/*
+				 * If the data would fit exactly in the
+				 * remaining space, we must overflow it to the
+				 * next page; otherwise the invariant that the
+				 * data must end on a page with FREESPACE
+				 * non-zero would fail.
+				 */
+				if (space == val_size && val_size == val->size)
+					goto toolarge;
 				off = OFFSET(p) - move_bytes;
-				p[n] = off;
 				memmove(cp + off, val_data, move_bytes);
 				val_data += move_bytes;
 				val_size -= move_bytes;
+				p[n] = off;
 				p[n - 2] = FULL_KEY_DATA;
 				FREESPACE(p) = FREESPACE(p) - move_bytes;
 				OFFSET(p) = off;
-			} else
+			} else {
+			toolarge:
 				p[n - 2] = FULL_KEY;
+			}
 		}
 		p = (u_int16_t *)bufp->page;
 		cp = bufp->page;
@@ -238,12 +251,12 @@
 	n -= 2;
 	bp[0] = n;
 	FREESPACE(bp) = hashp->BSIZE - PAGE_META(n);
-	OFFSET(bp) = hashp->BSIZE - 1;
+	OFFSET(bp) = hashp->BSIZE;
 
 	bufp->flags |= BUF_MOD;
 	if (rbufp)
 		__free_ovflpage(hashp, rbufp);
-	if (last_bfp != rbufp)
+	if (last_bfp && last_bfp != rbufp)
 		__free_ovflpage(hashp, last_bfp);
 
 	hashp->NKEYS--;

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/hash/hash_buf.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.9 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.12 2009/03/28 06:40:48 delphij Exp $");
 
 /*
  * PACKAGE: hash
@@ -57,6 +57,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef DEBUG
 #include <assert.h>
@@ -163,24 +164,38 @@
 
 	oaddr = 0;
 	bp = LRU;
+
+        /* It is bad to overwrite the page under the cursor. */
+        if (bp == hashp->cpage) {
+                BUF_REMOVE(bp);

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

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 15:54:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C7AA01065702; Tue, 31 Mar 2009 15:54:41 +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 832941065700
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:54:41 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 709C98FC16
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:54:41 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VFsfpk020793
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 15:54:41 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VFsfwr020791
	for perforce@freebsd.org; Tue, 31 Mar 2009 15:54:41 GMT
	(envelope-from scottl@freebsd.org)
Date: Tue, 31 Mar 2009 15:54:41 GMT
Message-Id: <200903311554.n2VFsfwr020791@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160060 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: Tue, 31 Mar 2009 15:54:43 -0000

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

Change 160060 by scottl@scottl-deimos on 2009/03/31 15:54:04

	Move cam_ed, cam_et, cam_eb, and cam_path definitions to cam_xpt.h.
	Also move the CAM_DEBUG logic there, as well as some function
	declarations.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#6 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#26 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#80 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#12 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#11 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#8 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#6 (text+ko) ====

@@ -46,6 +46,7 @@
 
 #ifdef _KERNEL
 #include <sys/libkern.h>
+#include <cam/cam_queue.h>
 #include <cam/cam_xpt.h>
 #endif
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#26 (text+ko) ====

@@ -48,6 +48,7 @@
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
+#include <cam/cam_queue.h>
 #include <cam/cam_xpt_periph.h>
 #include <cam/cam_periph.h>
 #include <cam/cam_debug.h>

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#80 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_periph.h>
+#include <cam/cam_queue.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt.h>
 #include <cam/cam_xpt_sim.h>
@@ -79,21 +80,6 @@
 };
 
 /*
- * Definition of an async handler callback block.  These are used to add
- * SIMs and peripherals to the async callback lists.
- */
-struct async_node {
-	SLIST_ENTRY(async_node)	links;
-	u_int32_t	event_enable;	/* Async Event enables */
-	void		(*callback)(void *arg, u_int32_t code,
-				    struct cam_path *path, void *args);
-	void		*callback_arg;
-};
-
-SLIST_HEAD(async_list, async_node);
-SLIST_HEAD(periph_list, cam_periph);
-
-/*
  * This is the maximum number of high powered commands (e.g. start unit)
  * that can be outstanding at a particular time.
  */
@@ -101,112 +87,6 @@
 #define CAM_MAX_HIGHPOWER  4
 #endif
 
-/*
- * Structure for queueing a device in a run queue.
- * There is one run queue for allocating new ccbs,
- * and another for sending ccbs to the controller.
- */
-struct cam_ed_qinfo {
-	cam_pinfo pinfo;
-	struct	  cam_ed *device;
-};
-
-/*
- * The CAM EDT (Existing Device Table) contains the device information for
- * all devices for all busses in the system.  The table contains a
- * cam_ed structure for each device on the bus.
- */
-struct cam_ed {
-	TAILQ_ENTRY(cam_ed) links;
-	struct	cam_ed_qinfo alloc_ccb_entry;
-	struct	cam_ed_qinfo send_ccb_entry;
-	struct	cam_et	 *target;
-	struct	cam_sim  *sim;
-	lun_id_t	 lun_id;
-	struct	camq drvq;		/*
-					 * Queue of type drivers wanting to do
-					 * work on this device.
-					 */
-	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
-	struct	async_list asyncs;	/* Async callback info for this B/T/L */
-	struct	periph_list periphs;	/* All attached devices */
-	u_int	generation;		/* Generation number */
-	struct	cam_periph *owner;	/* Peripheral driver's ownership tag */
-	struct	xpt_quirk_entry *quirk;	/* Oddities about this device */
-					/* Storage for the inquiry data */
-	cam_proto	 protocol;
-	u_int		 protocol_version;
-	cam_xport	 transport;
-	u_int		 transport_version;
-	struct		 scsi_inquiry_data inq_data;
-	u_int8_t	 inq_flags;	/*
-					 * Current settings for inquiry flags.
-					 * This allows us to override settings
-					 * like disconnection and tagged
-					 * queuing for a device.
-					 */
-	u_int8_t	 queue_flags;	/* Queue flags from the control page */
-	u_int8_t	 serial_num_len;
-	u_int8_t	*serial_num;
-	u_int32_t	 qfrozen_cnt;
-	u_int32_t	 flags;
-#define CAM_DEV_UNCONFIGURED	 	0x01
-#define CAM_DEV_REL_TIMEOUT_PENDING	0x02
-#define CAM_DEV_REL_ON_COMPLETE		0x04
-#define CAM_DEV_REL_ON_QUEUE_EMPTY	0x08
-#define CAM_DEV_RESIZE_QUEUE_NEEDED	0x10
-#define CAM_DEV_TAG_AFTER_COUNT		0x20
-#define CAM_DEV_INQUIRY_DATA_VALID	0x40
-#define	CAM_DEV_IN_DV			0x80
-#define	CAM_DEV_DV_HIT_BOTTOM		0x100
-	u_int32_t	 tag_delay_count;
-#define	CAM_TAG_DELAY_COUNT		5
-	u_int32_t	 tag_saved_openings;
-	u_int32_t	 refcount;
-	struct callout	 callout;
-};
-
-/*
- * Each target is represented by an ET (Existing Target).  These
- * entries are created when a target is successfully probed with an
- * identify, and removed when a device fails to respond after a number
- * of retries, or a bus rescan finds the device missing.
- */
-struct cam_et {
-	TAILQ_HEAD(, cam_ed) ed_entries;
-	TAILQ_ENTRY(cam_et) links;
-	struct	cam_eb	*bus;
-	target_id_t	target_id;
-	u_int32_t	refcount;
-	u_int		generation;
-	struct		timeval last_reset;
-};
-
-/*
- * Each bus is represented by an EB (Existing Bus).  These entries
- * are created by calls to xpt_bus_register and deleted by calls to
- * xpt_bus_deregister.
- */
-struct cam_eb {
-	TAILQ_HEAD(, cam_et) et_entries;
-	TAILQ_ENTRY(cam_eb)  links;
-	path_id_t	     path_id;
-	struct cam_sim	     *sim;
-	struct timeval	     last_reset;
-	u_int32_t	     flags;
-#define	CAM_EB_RUNQ_SCHEDULED	0x01
-	u_int32_t	     refcount;
-	u_int		     generation;
-	device_t	     parent_dev;
-};
-
-struct cam_path {
-	struct cam_periph *periph;
-	struct cam_eb	  *bus;
-	struct cam_et	  *target;
-	struct cam_ed	  *device;
-};
-
 struct xpt_quirk_entry {
 	struct scsi_inquiry_pattern inq_pat;
 	u_int8_t quirks;
@@ -697,7 +577,6 @@
 	.d_name =	"xpt",
 };
 
-
 /* Storage for debugging datastructures */
 #ifdef	CAMDEBUG
 struct cam_path *cam_dpath;
@@ -705,28 +584,6 @@
 u_int32_t cam_debug_delay;
 #endif
 
-#if defined(CAM_DEBUG_FLAGS) && !defined(CAMDEBUG)
-#error "You must have options CAMDEBUG to use options CAM_DEBUG_FLAGS"
-#endif
-
-/*
- * In order to enable the CAM_DEBUG_* options, the user must have CAMDEBUG
- * enabled.  Also, the user must have either none, or all of CAM_DEBUG_BUS,
- * CAM_DEBUG_TARGET, and CAM_DEBUG_LUN specified.
- */
-#if defined(CAM_DEBUG_BUS) || defined(CAM_DEBUG_TARGET) \
-    || defined(CAM_DEBUG_LUN)
-#ifdef CAMDEBUG
-#if !defined(CAM_DEBUG_BUS) || !defined(CAM_DEBUG_TARGET) \
-    || !defined(CAM_DEBUG_LUN)
-#error "You must define all or none of CAM_DEBUG_BUS, CAM_DEBUG_TARGET \
-        and CAM_DEBUG_LUN"
-#endif /* !CAM_DEBUG_BUS || !CAM_DEBUG_TARGET || !CAM_DEBUG_LUN */
-#else /* !CAMDEBUG */
-#error "You must use options CAMDEBUG if you use the CAM_DEBUG_* options"
-#endif /* CAMDEBUG */
-#endif /* CAM_DEBUG_BUS || CAM_DEBUG_TARGET || CAM_DEBUG_LUN */
-
 /* Our boot-time initialization hook */
 static int cam_module_event_handler(module_t, int /*modeventtype_t*/, void *);
 
@@ -742,14 +599,6 @@
 MODULE_VERSION(cam, 1);
 
 
-static cam_status	xpt_compile_path(struct cam_path *new_path,
-					 struct cam_periph *perph,
-					 path_id_t path_id,
-					 target_id_t target_id,
-					 lun_id_t lun_id);
-
-static void		xpt_release_path(struct cam_path *path);
-
 static void		xpt_async_bcast(struct async_list *async_head,
 					u_int32_t async_code,
 					struct cam_path *path,
@@ -854,7 +703,6 @@
 static void	 probedone(struct cam_periph *periph, union ccb *done_ccb);
 static void	 probecleanup(struct cam_periph *periph);
 static void	 xpt_find_quirk(struct cam_ed *device);
-static void	 xpt_devise_transport(struct cam_path *path);
 static void	 xpt_set_transfer_settings(struct ccb_trans_settings *cts,
 					   struct cam_ed *device,
 					   int async_update);
@@ -3993,7 +3841,7 @@
 	return (status);
 }
 
-static cam_status
+cam_status
 xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph,
 		 path_id_t path_id, target_id_t target_id, lun_id_t lun_id)
 {
@@ -4064,7 +3912,7 @@
 	return (status);
 }
 
-static void
+void
 xpt_release_path(struct cam_path *path)
 {
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_release_path\n"));
@@ -6445,7 +6293,7 @@
 }
 
 
-static void
+void
 xpt_devise_transport(struct cam_path *path)
 {
 	struct ccb_pathinq cpi;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#12 (text+ko) ====

@@ -48,6 +48,149 @@
 
 #ifdef _KERNEL
 
+/*
+ * Definition of an async handler callback block.  These are used to add
+ * SIMs and peripherals to the async callback lists.
+ */
+struct async_node {
+	SLIST_ENTRY(async_node)	links;
+	u_int32_t	event_enable;	/* Async Event enables */
+	void		(*callback)(void *arg, u_int32_t code,
+				    struct cam_path *path, void *args);
+	void		*callback_arg;
+};
+
+SLIST_HEAD(async_list, async_node);
+SLIST_HEAD(periph_list, cam_periph);
+
+/*
+ * Structure for queueing a device in a run queue.
+ * There is one run queue for allocating new ccbs,
+ * and another for sending ccbs to the controller.
+ */
+struct cam_ed_qinfo {
+	cam_pinfo pinfo;
+	struct	  cam_ed *device;
+};
+
+/*
+ * The CAM EDT (Existing Device Table) contains the device information for
+ * all devices for all busses in the system.  The table contains a
+ * cam_ed structure for each device on the bus.
+ */
+struct cam_ed {
+	TAILQ_ENTRY(cam_ed) links;
+	struct	cam_ed_qinfo alloc_ccb_entry;
+	struct	cam_ed_qinfo send_ccb_entry;
+	struct	cam_et	 *target;
+	struct	cam_sim  *sim;
+	lun_id_t	 lun_id;
+	struct	camq drvq;		/*
+					 * Queue of type drivers wanting to do
+					 * work on this device.
+					 */
+	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
+	struct	async_list asyncs;	/* Async callback info for this B/T/L */
+	struct	periph_list periphs;	/* All attached devices */
+	u_int	generation;		/* Generation number */
+	struct	cam_periph *owner;	/* Peripheral driver's ownership tag */
+	struct	xpt_quirk_entry *quirk;	/* Oddities about this device */
+					/* Storage for the inquiry data */
+	cam_proto	 protocol;
+	u_int		 protocol_version;
+	cam_xport	 transport;
+	u_int		 transport_version;
+	struct		 scsi_inquiry_data inq_data;
+	u_int8_t	 inq_flags;	/*
+					 * Current settings for inquiry flags.
+					 * This allows us to override settings
+					 * like disconnection and tagged
+					 * queuing for a device.
+					 */
+	u_int8_t	 queue_flags;	/* Queue flags from the control page */
+	u_int8_t	 serial_num_len;
+	u_int8_t	*serial_num;
+	u_int32_t	 qfrozen_cnt;
+	u_int32_t	 flags;
+#define CAM_DEV_UNCONFIGURED	 	0x01
+#define CAM_DEV_REL_TIMEOUT_PENDING	0x02
+#define CAM_DEV_REL_ON_COMPLETE		0x04
+#define CAM_DEV_REL_ON_QUEUE_EMPTY	0x08
+#define CAM_DEV_RESIZE_QUEUE_NEEDED	0x10
+#define CAM_DEV_TAG_AFTER_COUNT		0x20
+#define CAM_DEV_INQUIRY_DATA_VALID	0x40
+#define	CAM_DEV_IN_DV			0x80
+#define	CAM_DEV_DV_HIT_BOTTOM		0x100
+	u_int32_t	 tag_delay_count;
+#define	CAM_TAG_DELAY_COUNT		5
+	u_int32_t	 tag_saved_openings;
+	u_int32_t	 refcount;
+	struct callout	 callout;
+};
+
+/*
+ * Each target is represented by an ET (Existing Target).  These
+ * entries are created when a target is successfully probed with an
+ * identify, and removed when a device fails to respond after a number
+ * of retries, or a bus rescan finds the device missing.
+ */
+struct cam_et {
+	TAILQ_HEAD(, cam_ed) ed_entries;
+	TAILQ_ENTRY(cam_et) links;
+	struct	cam_eb	*bus;
+	target_id_t	target_id;
+	u_int32_t	refcount;
+	u_int		generation;
+	struct		timeval last_reset;
+};
+
+/*
+ * Each bus is represented by an EB (Existing Bus).  These entries
+ * are created by calls to xpt_bus_register and deleted by calls to
+ * xpt_bus_deregister.
+ */
+struct cam_eb {
+	TAILQ_HEAD(, cam_et) et_entries;
+	TAILQ_ENTRY(cam_eb)  links;
+	path_id_t	     path_id;
+	struct cam_sim	     *sim;
+	struct timeval	     last_reset;
+	u_int32_t	     flags;
+#define	CAM_EB_RUNQ_SCHEDULED	0x01
+	u_int32_t	     refcount;
+	u_int		     generation;
+	device_t	     parent_dev;
+};
+
+struct cam_path {
+	struct cam_periph *periph;
+	struct cam_eb	  *bus;
+	struct cam_et	  *target;
+	struct cam_ed	  *device;
+};
+
+#if defined(CAM_DEBUG_FLAGS) && !defined(CAMDEBUG)
+#error "You must have options CAMDEBUG to use options CAM_DEBUG_FLAGS"
+#endif
+
+/*
+ * In order to enable the CAM_DEBUG_* options, the user must have CAMDEBUG
+ * enabled.  Also, the user must have either none, or all of CAM_DEBUG_BUS,
+ * CAM_DEBUG_TARGET, and CAM_DEBUG_LUN specified.
+ */
+#if defined(CAM_DEBUG_BUS) || defined(CAM_DEBUG_TARGET) \
+    || defined(CAM_DEBUG_LUN)
+#ifdef CAMDEBUG
+#if !defined(CAM_DEBUG_BUS) || !defined(CAM_DEBUG_TARGET) \
+    || !defined(CAM_DEBUG_LUN)
+#error "You must define all or none of CAM_DEBUG_BUS, CAM_DEBUG_TARGET \
+        and CAM_DEBUG_LUN"
+#endif /* !CAM_DEBUG_BUS || !CAM_DEBUG_TARGET || !CAM_DEBUG_LUN */
+#else /* !CAMDEBUG */
+#error "You must use options CAMDEBUG if you use the CAM_DEBUG_* options"
+#endif /* CAMDEBUG */
+#endif /* CAM_DEBUG_BUS || CAM_DEBUG_TARGET || CAM_DEBUG_LUN */
+
 void			xpt_action(union ccb *new_ccb);
 void			xpt_devise_transport(struct cam_path *path);
 void			xpt_setup_ccb(struct ccb_hdr *ccb_h,

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#11 (text+ko) ====

@@ -33,6 +33,7 @@
 #ifndef _CAM_CAM_XPT_PERIPH_H
 #define _CAM_CAM_XPT_PERIPH_H 1
 
+#include <cam/cam_queue.h>
 #include <cam/cam_xpt.h>
 
 /* Functions accessed by the peripheral drivers */

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#8 (text+ko) ====

@@ -48,6 +48,7 @@
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
+#include <cam/cam_queue.h>
 #include <cam/cam_xpt.h>
 #include <cam/scsi/scsi_all.h>
 #include <sys/sbuf.h>

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 17:30:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12143106566B; Tue, 31 Mar 2009 17:30:32 +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 B5CD51065676
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A30358FC1C
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VHUV3p041770
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VHUVEk041768
	for perforce@freebsd.org; Tue, 31 Mar 2009 17:30:31 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 17:30:31 GMT
Message-Id: <200903311730.n2VHUVEk041768@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160063 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: Tue, 31 Mar 2009 17:30:33 -0000

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

Change 160063 by trasz@trasz_victim7 on 2009/03/31 17:29:33

	Fix build even more.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#5 (text+ko) ====

@@ -142,7 +142,7 @@
 int
 acl_from_aces(struct acl *aclp, const ace_t *aces, int nentries)
 {
-	int i;
+	int i, tmpflags = 0;
 	struct acl_entry *entry;
 	const ace_t *ace;
 
@@ -172,7 +172,8 @@
 			entry->ae_id = ACL_UNDEFINED_ID;
 
 		_bsd_from_sun(&(entry->ae_perm), ace->a_access_mask, perms);
-		_bsd_from_sun(&(entry->ae_flags), ace->a_flags, flags);
+		_bsd_from_sun(&tmpflags, ace->a_flags, flags);
+		entry->ae_flags = tmpflags;
 
 		switch (ace->a_type) {
 		case ACE_ACCESS_ALLOWED_ACE_TYPE:

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 18:29:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F02D1065674; Tue, 31 Mar 2009 18:29:32 +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 EEEC91065670
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 18:29:31 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DC8B48FC1E
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 18:29:31 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VITVML048215
	for <perforce@FreeBSD.org>; Tue, 31 Mar 2009 18:29:31 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VITVCU048213
	for perforce@freebsd.org; Tue, 31 Mar 2009 18:29:31 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Tue, 31 Mar 2009 18:29:31 GMT
Message-Id: <200903311829.n2VITVCU048213@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160066 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: Tue, 31 Mar 2009 18:29:33 -0000

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

Change 160066 by lulf@lulf_carrot on 2009/03/31 18:28:55

	- Fix build. The VIMAGE stuff should be calculated too.

Affected files ...

.. //depot/projects/avr32/src/sys/avr32/include/elf.h#2 edit
.. //depot/projects/avr32/src/sys/sys/vimage.h#3 edit

Differences ...

==== //depot/projects/avr32/src/sys/avr32/include/elf.h#2 (text+ko) ====

@@ -76,8 +76,9 @@
 #define AT_EUID         12      /* Effective uid. */
 #define AT_GID          13      /* Real gid. */
 #define AT_EGID         14      /* Effective gid. */
+#define	AT_EXECPATH	15	/* Path to the executable. */
 
-#define AT_COUNT        15      /* Count of defined aux entry types. */
+#define AT_COUNT        16      /* Count of defined aux entry types. */
 
 
 /* Define "machine" characteristics */

==== //depot/projects/avr32/src/sys/sys/vimage.h#3 (text+ko) ====

@@ -131,6 +131,13 @@
 #define	SIZEOF_vnet_inet6	8536
 #define	SIZEOF_vnet_ipsec	1
 #endif
+#ifdef __avr32__
+#define	SIZEOF_vnet_net		236
+#define	SIZEOF_vnet_net_LINT	1	/* No LINT kernel yet. */
+#define	SIZEOF_vnet_inet	2580
+#define	SIZEOF_vnet_inet6	8536
+#define	SIZEOF_vnet_ipsec	1
+#endif
 #ifdef __i386__ /* incl. pc98 */
 #define	SIZEOF_vnet_net		236
 #define	SIZEOF_vnet_net_LINT	2576

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 18:58:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 410781065672; Tue, 31 Mar 2009 18:58:01 +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 DCEF0106566B
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 18:58:00 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C6FAB8FC17
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 18:58:00 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VIw0ZH050366
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 18:58:00 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VIw0lg050364
	for perforce@freebsd.org; Tue, 31 Mar 2009 18:58:00 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 18:58:00 GMT
Message-Id: <200903311858.n2VIw0lg050364@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160067 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: Tue, 31 Mar 2009 18:58:02 -0000

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

Change 160067 by trasz@trasz_victim7 on 2009/03/31 18:57:14

	Reduce ugliness by removing re#definitions.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#6 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 (text+ko) ====

@@ -424,6 +424,8 @@
 #endif
 }
 
+#if !defined(_KERNEL)
+
 acl_t *
 acl_alloc(enum acl_type type)
 {
@@ -1725,3 +1727,4 @@
 	return (error);
 #endif
 }
+#endif /* _KERNEL */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 (text+ko) ====

@@ -46,6 +46,7 @@
 extern int ace_trivial_common(void *, int,
     uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *,
     uint32_t *mask));
+#if !defined(_KERNEL)
 extern acl_t *acl_alloc(acl_type_t);
 extern void acl_free(acl_t *aclp);
 extern int acl_translate(acl_t *aclp, int target_flavor,
@@ -53,6 +54,7 @@
 void ksort(caddr_t v, int n, int s, int (*f)());
 int cmp2acls(void *a, void *b);
 
+#endif /* _KERNEL */
 
 #ifdef	__cplusplus
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#6 (text+ko) ====

@@ -25,23 +25,12 @@
  *
  */
 
-#define acl_t _zfs_acl_t
-#define acl_type_t _zfs_acl_type_t
-
-/* XXX: Somewhere in these includes must be bzero(9). */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/extattr.h>
 
 /* XXX: Most of these isn't needed either. */
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/systm.h>
 #include <sys/sysmacros.h>
 #include <sys/resource.h>
 #include <sys/vfs.h>
@@ -78,9 +67,6 @@
 #include <sys/sf_buf.h>
 #include <sys/sched.h>
 
-#undef acl_t
-#undef acl_type_t
-
 /*
  * Pull FreeBSD sys/acl.h, not the ZFS one.
  */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 (text+ko) ====

@@ -25,9 +25,6 @@
 
 /* Portions Copyright 2007 Jeremy Teo */
 
-#define acl_t _zfs_acl_t
-#define acl_type_t _zfs_acl_type_t
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -70,9 +67,6 @@
 #include <sys/sf_buf.h>
 #include <sys/sched.h>
 
-#undef acl_t
-#undef acl_type_t
-
 /*
  * Pull FreeBSD sys/acl.h, not the ZFS one.
  */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 (text+ko) ====

@@ -31,6 +31,14 @@
 #include <sys/types.h>
 #include <sys/acl_impl.h>
 
+/*
+ * When compiling OpenSolaris code, this file is getting included instead
+ * of FreeBSD one.  Pull the original sys/acl.h as well.
+ */
+#undef _SYS_ACL_H
+#include "../../../../../../sys/acl.h"
+#define	_SYS_ACL_H
+
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -49,7 +57,9 @@
 	uint16_t	a_type;		/* allow or deny */
 } ace_t;
 
+#if !defined(_KERNEL)
 typedef struct acl_info acl_t;
+#endif
 
 /*
  * The following are Defined types for an aclent_t.

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ====

@@ -44,10 +44,10 @@
 typedef enum acl_type {
 	ACLENT_T = 0,
 	ACE_T = 1
-} acl_type_t;
+} zfs_acl_type_t;
 
 struct acl_info {
-	acl_type_t acl_type;		/* style of acl */
+	zfs_acl_type_t acl_type;		/* style of acl */
 	int acl_cnt;			/* number of acl entries */
 	int acl_entry_size;		/* sizeof acl entry */
 	int acl_flags;			/* special flags about acl */

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 19:11:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E91910657A5; Tue, 31 Mar 2009 19:11:15 +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 99D361065798
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:11:14 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 863C38FC2D
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:11:14 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VJBEW6052349
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:11:14 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VJBENa052347
	for perforce@freebsd.org; Tue, 31 Mar 2009 19:11:14 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 19:11:14 GMT
Message-Id: <200903311911.n2VJBENa052347@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160068 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: Tue, 31 Mar 2009 19:11:17 -0000

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

Change 160068 by trasz@trasz_victim7 on 2009/03/31 19:10:39

	Remove more ugliness.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#7 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#7 (text+ko) ====

@@ -67,11 +67,6 @@
 #include <sys/sf_buf.h>
 #include <sys/sched.h>
 
-/*
- * Pull FreeBSD sys/acl.h, not the ZFS one.
- */
-#include "../../../../../../../sys/acl.h"
-
 #include "acl_compat.h"
 
 struct artwo {
@@ -103,32 +98,38 @@
 			{ACE_FAILED_ACCESS_ACE_FLAG, ACL_ENTRY_FAILED_ACCESS},
 			{0, 0}};
 
-static void
-_bsd_from_sun(int *bsd, uint32_t sun, const struct artwo *table)
+static int
+_bsd_from_sun(uint32_t sun, const struct artwo *table)
 {
 	const struct artwo *tmp;
+	int bsd = 0;
 
 	for (tmp = table; tmp->sun != 0; tmp++) {
 		if (sun & tmp->sun)
-			*bsd |= tmp->bsd;
+			bsd |= tmp->bsd;
 	}
+
+	return (bsd);
 }
 
-static void
-_sun_from_bsd(uint32_t *sun, int bsd, const struct artwo *table)
+static uint32_t
+_sun_from_bsd(int bsd, const struct artwo *table)
 {
 	const struct artwo *tmp;
+	uint32_t sun = 0;
 
 	for (tmp = table; tmp->bsd != 0; tmp++) {
 		if (bsd & tmp->bsd)
-			*sun |= tmp->sun;
+			sun |= tmp->sun;
 	}
+
+	return (sun);
 }
 
 int
 acl_from_aces(struct acl *aclp, const ace_t *aces, int nentries)
 {
-	int i, tmpflags = 0;
+	int i;
 	struct acl_entry *entry;
 	const ace_t *ace;
 
@@ -157,9 +158,8 @@
 		else
 			entry->ae_id = ACL_UNDEFINED_ID;
 
-		_bsd_from_sun(&(entry->ae_perm), ace->a_access_mask, perms);
-		_bsd_from_sun(&tmpflags, ace->a_flags, flags);
-		entry->ae_flags = tmpflags;
+		entry->ae_perm = _bsd_from_sun(ace->a_access_mask, perms);
+		entry->ae_flags = _bsd_from_sun(ace->a_flags, flags);
 
 		switch (ace->a_type) {
 		case ACE_ACCESS_ALLOWED_ACE_TYPE:
@@ -175,8 +175,7 @@
 			entry->ae_extended = ACL_EXTENDED_ALARM;
 			break;
 		default:
-			printf("_acl_from_aces: a_type is 0x%x; panic?\n", ace->a_type);
-			return (EINVAL);
+			panic("_acl_from_aces: a_type is 0x%x", ace->a_type);
 		}
 	}
 
@@ -189,7 +188,6 @@
 	int i;
 	const struct acl_entry *entry;
 	ace_t *ace;
-	uint32_t tmpflags = 0;
 
 	bzero(aces, sizeof(*aces) * aclp->acl_cnt);
 
@@ -202,21 +200,19 @@
 		ace->a_who = entry->ae_id;
 
 		if (entry->ae_tag == ACL_USER_OBJ)
-			tmpflags = ACE_OWNER;
+			ace->a_flags = ACE_OWNER;
 		else if (entry->ae_tag == ACL_GROUP_OBJ)
-			tmpflags = (ACE_GROUP | ACE_IDENTIFIER_GROUP);
+			ace->a_flags = (ACE_GROUP | ACE_IDENTIFIER_GROUP);
 		else if (entry->ae_tag == ACL_GROUP)
-			tmpflags = ACE_IDENTIFIER_GROUP;
+			ace->a_flags = ACE_IDENTIFIER_GROUP;
 		else if (entry->ae_tag == ACL_EVERYONE)
-			tmpflags = ACE_EVERYONE;
+			ace->a_flags = ACE_EVERYONE;
 		else /* ACL_USER */
-			tmpflags = 0;
+			ace->a_flags = 0;
 
-		_sun_from_bsd(&(ace->a_access_mask), entry->ae_perm, perms);
-		_sun_from_bsd(&tmpflags, entry->ae_flags, flags);
+		ace->a_access_mask = _sun_from_bsd(entry->ae_perm, perms);
+		ace->a_flags |= _sun_from_bsd(entry->ae_flags, flags);
 
-		ace->a_flags = tmpflags;
-
 		switch (entry->ae_extended) {
 		case ACL_EXTENDED_ALLOW:
 			ace->a_type = ACE_ACCESS_ALLOWED_ACE_TYPE;
@@ -231,11 +227,9 @@
 			ace->a_type = ACE_SYSTEM_AUDIT_ACE_TYPE;
 			break;
 		default:
-			printf("_aces_from_acl: ae_extended is 0x%x; panic?\n", entry->ae_extended);
-			return (EINVAL);
+			panic("_aces_from_acl: ae_extended is 0x%x", entry->ae_extended);
 		}
 	}
 
 	return (0);
 }
-

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 19:18:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 666811065675; Tue, 31 Mar 2009 19:18:23 +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 1EE901065672
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:18:23 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5E3B8FC14
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:18:22 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VJIMsK052834
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 19:18:22 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VJIMFO052832
	for perforce@freebsd.org; Tue, 31 Mar 2009 19:18:22 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 19:18:22 GMT
Message-Id: <200903311918.n2VJIMFO052832@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160069 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: Tue, 31 Mar 2009 19:18:25 -0000

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

Change 160069 by trasz@trasz_victim7 on 2009/03/31 19:18:15

	Rename few more things.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#8 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#8 (text+ko) ====

@@ -69,12 +69,12 @@
 
 #include "acl_compat.h"
 
-struct artwo {
-	uint32_t	sun;
-	int		bsd;
+struct zfs2bsd {
+	uint32_t	zb_zfs;
+	int		zb_bsd;
 };
 
-struct artwo perms[] = {{ACE_READ_DATA, ACL_READ_DATA},
+struct zfs2bsd perms[] = {{ACE_READ_DATA, ACL_READ_DATA},
 			{ACE_WRITE_DATA, ACL_WRITE_DATA},
 			{ACE_EXECUTE, ACL_EXECUTE},
 			{ACE_APPEND_DATA, ACL_APPEND_DATA},
@@ -90,7 +90,7 @@
 			{ACE_SYNCHRONIZE, ACL_SYNCHRONIZE},
 			{0, 0}};
 
-struct artwo flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_FILE_INHERIT},
+struct zfs2bsd flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_FILE_INHERIT},
 			{ACE_DIRECTORY_INHERIT_ACE, ACL_ENTRY_DIRECTORY_INHERIT},
 			{ACE_NO_PROPAGATE_INHERIT_ACE, ACL_ENTRY_LIMIT_INHERIT},
 			{ACE_INHERIT_ONLY_ACE, ACL_ENTRY_ONLY_INHERIT},
@@ -99,31 +99,31 @@
 			{0, 0}};
 
 static int
-_bsd_from_sun(uint32_t sun, const struct artwo *table)
+_bsd_from_zfs(uint32_t zfs, const struct zfs2bsd *table)
 {
-	const struct artwo *tmp;
+	const struct zfs2bsd *tmp;
 	int bsd = 0;
 
-	for (tmp = table; tmp->sun != 0; tmp++) {
-		if (sun & tmp->sun)
-			bsd |= tmp->bsd;
+	for (tmp = table; tmp->zb_zfs != 0; tmp++) {
+		if (zfs & tmp->zb_zfs)
+			bsd |= tmp->zb_bsd;
 	}
 
 	return (bsd);
 }
 
 static uint32_t
-_sun_from_bsd(int bsd, const struct artwo *table)
+_zfs_from_bsd(int bsd, const struct zfs2bsd *table)
 {
-	const struct artwo *tmp;
-	uint32_t sun = 0;
+	const struct zfs2bsd *tmp;
+	uint32_t zfs = 0;
 
-	for (tmp = table; tmp->bsd != 0; tmp++) {
-		if (bsd & tmp->bsd)
-			sun |= tmp->sun;
+	for (tmp = table; tmp->zb_bsd != 0; tmp++) {
+		if (bsd & tmp->zb_bsd)
+			zfs |= tmp->zb_zfs;
 	}
 
-	return (sun);
+	return (zfs);
 }
 
 int
@@ -158,8 +158,8 @@
 		else
 			entry->ae_id = ACL_UNDEFINED_ID;
 
-		entry->ae_perm = _bsd_from_sun(ace->a_access_mask, perms);
-		entry->ae_flags = _bsd_from_sun(ace->a_flags, flags);
+		entry->ae_perm = _bsd_from_zfs(ace->a_access_mask, perms);
+		entry->ae_flags = _bsd_from_zfs(ace->a_flags, flags);
 
 		switch (ace->a_type) {
 		case ACE_ACCESS_ALLOWED_ACE_TYPE:
@@ -210,8 +210,8 @@
 		else /* ACL_USER */
 			ace->a_flags = 0;
 
-		ace->a_access_mask = _sun_from_bsd(entry->ae_perm, perms);
-		ace->a_flags |= _sun_from_bsd(entry->ae_flags, flags);
+		ace->a_access_mask = _zfs_from_bsd(entry->ae_perm, perms);
+		ace->a_flags |= _zfs_from_bsd(entry->ae_flags, flags);
 
 		switch (entry->ae_extended) {
 		case ACL_EXTENDED_ALLOW:

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 20:19:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B8331065695; Tue, 31 Mar 2009 20:19:25 +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 0D4FB1065680
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 20:19:25 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EE43F8FC19
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 20:19:24 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VKJOAV067343
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 20:19:24 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VKJONm067341
	for perforce@freebsd.org; Tue, 31 Mar 2009 20:19:24 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 20:19:24 GMT
Message-Id: <200903312019.n2VKJONm067341@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160072 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: Tue, 31 Mar 2009 20:19:27 -0000

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

Change 160072 by trasz@trasz_victim7 on 2009/03/31 20:19:20

	Fix more build problems.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#9 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#30 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#7 (text+ko) ====

@@ -144,7 +144,8 @@
 static int
 parse_access_mask(char *str, acl_entry_t entry)
 {
-	int error, perm;
+	int error;
+	acl_perm_t perm;
 
 	error = _nfs4_parse_access_mask(str, &perm);
 	if (error)
@@ -158,7 +159,8 @@
 static int
 parse_flags(char *str, acl_entry_t entry)
 {
-	int error, flags;
+	int error;
+	acl_flag_t flags;
 
 	error = _nfs4_parse_flags(str, &flags);
 	if (error)

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#9 (text+ko) ====

@@ -45,10 +45,10 @@
 int	_entry_brand_may_be(const acl_entry_t entry, int brand);
 void	_acl_brand_as(acl_t acl, int brand);
 void	_entry_brand_as(const acl_entry_t entry, int brand);
-int	_nfs4_format_flags(char *str, size_t size, uint32_t var, int verbose);
-int	_nfs4_format_access_mask(char *str, size_t size, uint32_t var, int verbose);
-int	_nfs4_parse_flags(const char *str, uint32_t *var);
-int	_nfs4_parse_access_mask(const char *str, uint32_t *var);
+int	_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose);
+int	_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose);
+int	_nfs4_parse_flags(const char *str, acl_flag_t *var);
+int	_nfs4_parse_access_mask(const char *str, acl_perm_t *var);
 int	_posix1e_acl_check(acl_t acl);
 int	_posix1e_acl_sort(acl_t acl);
 int	_posix1e_acl(acl_t acl, acl_type_t type);

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#7 (text+ko) ====

@@ -62,11 +62,11 @@
      { ACL_DELETE, "delete", 'd'},
      { ACL_READ_ATTRIBUTES, "read_attributes", 'a'},
      { ACL_WRITE_ATTRIBUTES, "write_attributes", 'A'},
-     { ACL_READ_EXTATTRIBUTES, "read_xattr", 'R'},
-     { ACL_WRITE_EXTATTRIBUTES, "write_xattr", 'W'},
-     { ACL_READ_SECURITY, "read_acl", 'c'},
-     { ACL_WRITE_SECURITY, "write_acl", 'C'},
-     { ACL_CHANGE_OWNER, "write_owner", 'o'},
+     { ACL_READ_NAMED_ATTRS, "read_xattr", 'R'},
+     { ACL_WRITE_NAMED_ATTRS, "write_xattr", 'W'},
+     { ACL_READ_ACL, "read_acl", 'c'},
+     { ACL_WRITE_ACL, "write_acl", 'C'},
+     { ACL_WRITE_OWNER, "write_owner", 'o'},
      { ACL_SYNCHRONIZE, "synchronize", 's'},
      { 0, 0, 0}};
 
@@ -201,7 +201,7 @@
 }
 
 int
-_nfs4_format_flags(char *str, size_t size, uint32_t var, int verbose)
+_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose)
 {
 	if (verbose)
 		return (format_flags_verbose(str, size, var, a_flags));
@@ -210,7 +210,7 @@
 }
 
 int
-_nfs4_format_access_mask(char *str, size_t size, uint32_t var, int verbose)
+_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose)
 {
 	if (verbose)
 		return (format_flags_verbose(str, size, var, a_access_masks));
@@ -219,28 +219,33 @@
 }
 
 int
-_nfs4_parse_flags(const char *str, uint32_t *var)
+_nfs4_parse_flags(const char *str, acl_flag_t *flags)
 {
 	int error, try_compact;
+	int tmpflags;
 
-	error = parse_flags_verbose(str, var, a_flags, "flags", &try_compact);
+	error = parse_flags_verbose(str, &tmpflags, a_flags, "flags", &try_compact);
 	if (error && try_compact)
-		error = parse_flags_compact(str, var, a_flags, "flags");
+		error = parse_flags_compact(str, &tmpflags, a_flags, "flags");
+
+	*flags = tmpflags;
 
 	return (error);
 }
 
 int
-_nfs4_parse_access_mask(const char *str, uint32_t *var)
+_nfs4_parse_access_mask(const char *str, acl_perm_t *perms)
 {
 	int error, try_compact;
+	int tmpperms;
 
-	error = parse_flags_verbose(str, var, a_access_masks,
+	error = parse_flags_verbose(str, &tmpperms, a_access_masks,
 	    "access permissions", &try_compact);
 	if (error && try_compact)
-		error = parse_flags_compact(str, var,
+		error = parse_flags_compact(str, &tmpperms,
 		    a_access_masks, "access permissions");
 
+	*perms = tmpperms;
+
 	return (error);
 }
-

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 (text+ko) ====

@@ -31,13 +31,15 @@
 #include <sys/types.h>
 #include <sys/acl_impl.h>
 
+#if defined(_KERNEL)
 /*
- * When compiling OpenSolaris code, this file is getting included instead
- * of FreeBSD one.  Pull the original sys/acl.h as well.
+ * When compiling OpenSolaris kernel code, this file is getting
+ * included instead of FreeBSD one.  Pull the original sys/acl.h as well.
  */
 #undef _SYS_ACL_H
 #include "../../../../../../sys/acl.h"
 #define	_SYS_ACL_H
+#endif /* _KERNEL */
 
 #ifdef	__cplusplus
 extern "C" {

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#30 (text+ko) ====

@@ -93,7 +93,7 @@
 typedef uint16_t	acl_flag_t;
 typedef int		acl_type_t;
 typedef int		*acl_permset_t;
-typedef int		*acl_flagset_t;
+typedef uint16_t	*acl_flagset_t;
 
 struct acl_entry {
 	acl_tag_t	ae_tag;

From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 23:32:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B70641065675; Tue, 31 Mar 2009 23:32:41 +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 7655D1065673
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 23:32:41 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 641C08FC12
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 23:32:41 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VNWfre017542
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 23:32:41 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VNWfPb017540
	for perforce@freebsd.org; Tue, 31 Mar 2009 23:32:41 GMT
	(envelope-from zec@fer.hr)
Date: Tue, 31 Mar 2009 23:32:41 GMT
Message-Id: <200903312332.n2VNWfPb017540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160078 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: Tue, 31 Mar 2009 23:32:42 -0000

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

Change 160078 by zec@zec_tpx32 on 2009/03/31 23:32:25

	Introduce vnet module registration / initialization framework
	with dependency tracking / ordering enforcement.
	
	With this change, per-vnet initialization functions introduced
	@159248 are no longer directly called from old / traditional
	initialization functions (thus in most cases inlined by cc to
	pre-159248 code), but are instead registered to the vnet
	framework first, and are invoked only after the prerequisite
	modules have been initialized.  In the long  run, this
	framework should allow us to both initialize and dismantle
	multiple vnet instances in a correct order.
	
	The problem this change aims to solve is how to reply the
	initialization sequence of various network stack components,
	which are traditionally triggered via different mechanisms
	(SYSINIT, protosw etc.) and which can be quite different
	depending on whether certain chunks of code are statically
	compiled into the kernel, loaded as modules by boot loader,
	or kldloaded at run time, even in presence of multiple already
	existing vnet instances.
	
	The approach is simple - we essentially record the init
	sequence established by existing code whenever
	vnet_mod_register() is called.  vnet_mod_register_multi()
	allows a single initializer function to be registered multiple
	times but with different arguments - currently this is only
	used in kern/uipc_domain.c by net_add_domain() with different
	struct domain * as arguments.  Additional ordering constraints
	may be specified by filling in the prerequisite vnet module ID
	in module's vnet_modinfo structure -> vmi_dependson field.
	Implicitly / unless specified otherwise all vnet modules depend
	on VNET_MOD_NET (container for ifnet list head, rt_tables etc.),
	which has to be initialized first.
	
	Currently, each module can specify only a single prerequisite,
	which may or may not be problematic.  In particular, INET6
	depends on INET being already instantiated, due to TCP / UDP
	structures residing in INET container.  IPSEC also depends on
	INET, which will in turn additionally complicate making
	INET6-only kernel configs a reality.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/if.c#38 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#18 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#20 edit
.. //depot/projects/vimage-commit2/src/sys/net/route.c#30 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#23 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/accf_http.c#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#29 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#20 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#36 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#30 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#25 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#25 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#31 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#8 (text+ko) ====

@@ -41,22 +41,133 @@
 
 #ifndef VIMAGE_GLOBALS
 
+#define DEBUG_ORDERING
+
 MALLOC_DEFINE(M_VIMAGE, "vimage", "vimage resource container");
 
 static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head;
+static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head;
+static void vnet_mod_complete_registration(struct vnet_modlink *);
+static int vnet_mod_constructor(struct vnet_modlink *);
 
 void
 vnet_mod_register(const struct vnet_modinfo *vmi)
 {
+
+	vnet_mod_register_multi(vmi, NULL, NULL);
+}
+
+void
+vnet_mod_register_multi(const struct vnet_modinfo *vmi, void *iarg,
+    char *iname)
+{
 	struct vnet_modlink *vml, *vml_iter;
 	
 	/* Do not register the same module instance more than once. */
 	TAILQ_FOREACH(vml_iter, &vnet_modlink_head, vml_mod_le)
-		if (vml_iter->vml_modinfo == vmi)
-			panic("%s: %s", __func__, vmi->vmi_name);
+		if (vml_iter->vml_modinfo == vmi && vml_iter->vml_iarg == iarg)
+			break;
+	if (vml_iter != NULL)
+		panic("attempt to register an already registered vnet module");
 	vml = malloc(sizeof(struct vnet_modlink), M_VIMAGE, M_NOWAIT);
+
+	/*
+	 * XXX we support only statically assigned module IDs at the time.
+	 * In principle modules should be able to get a dynamically
+	 * assigned ID at registration time.
+	 */
+	VNET_ASSERT(vmi->vmi_id > 0 || vmi->vmi_id < VNET_MOD_MAX);
+	VNET_ASSERT(!((iarg == NULL) ^ (iname == NULL)));
+
 	vml->vml_modinfo = vmi;
+	vml->vml_iarg = iarg;
+	vml->vml_iname = iname;
+
+	/* Check whether the module we depend on is already registered */
+	if (vmi->vmi_dependson != vmi->vmi_id) {
+		TAILQ_FOREACH(vml_iter, &vnet_modlink_head, vml_mod_le)
+			if (vml_iter->vml_modinfo->vmi_id ==
+			    vmi->vmi_dependson)
+				break;	/* Depencency found, we are done */
+		if (vml_iter == NULL) {
+#ifdef DEBUG_ORDERING
+			printf("dependency %d missing for vnet mod %s,"
+			    "postponing registration\n",
+			    vmi->vmi_dependson, vmi->vmi_name);
+#endif /* DEBUG_ORDERING */
+			TAILQ_INSERT_TAIL(&vnet_modpending_head, vml,
+			    vml_mod_le);
+			return;
+		}
+	}
+
+	vnet_mod_complete_registration(vml);
+}
+	
+void
+vnet_mod_complete_registration(struct vnet_modlink *vml)
+{
+	VNET_ITERATOR_DECL(vnet_iter);
+	struct vnet_modlink *vml_iter;
+
 	TAILQ_INSERT_TAIL(&vnet_modlink_head, vml, vml_mod_le);
+
+	VNET_FOREACH(vnet_iter) {
+		CURVNET_SET_QUIET(vnet_iter);
+		vnet_mod_constructor(vml);
+		CURVNET_RESTORE();
+	}
+
+	/* Check for pending modules depending on us */
+	do {
+		TAILQ_FOREACH(vml_iter, &vnet_modpending_head, vml_mod_le)
+			if (vml_iter->vml_modinfo->vmi_dependson ==
+			    vml->vml_modinfo->vmi_id)
+				break;
+		if (vml_iter != NULL) {
+#ifdef DEBUG_ORDERING
+			printf("vnet mod %s now registering,"
+			    "dependency %d loaded\n",
+			    vml_iter->vml_modinfo->vmi_name,
+			    vml->vml_modinfo->vmi_id);
+#endif /* DEBUG_ORDERING */
+			TAILQ_REMOVE(&vnet_modpending_head, vml_iter,
+			    vml_mod_le);
+			vnet_mod_complete_registration(vml_iter);
+		}
+	} while (vml_iter != NULL);
+}
+
+static int vnet_mod_constructor(struct vnet_modlink *vml)
+{
+	const struct vnet_modinfo *vmi = vml->vml_modinfo;
+
+#ifdef DEBUG_ORDERING
+	printf("instatiating vnet_%s", vmi->vmi_name);
+	if (vml->vml_iarg)
+		printf("/%s", vml->vml_iname);
+	printf(": ");
+	if (vmi->vmi_struct_size)
+		printf("malloc(%d); ", vmi->vmi_struct_size);
+	if (vmi->vmi_iattach != NULL)
+		printf("iattach()");
+	printf("\n");
+#endif
+
+#ifdef VIMAGE
+	if (vmi->vmi_struct_size) {
+		void *mem = malloc(vmi->vmi_struct_size, M_VNET,
+		    M_NOWAIT | M_ZERO);
+		if (mem == NULL) /* XXX should return error, not panic */
+			panic("vi_alloc: malloc for %s\n", vmi->vmi_name);
+		curvnet->mod_data[vmi->vmi_id] = mem;
+	}
+#endif
+
+	if (vmi->vmi_iattach != NULL)
+		vmi->vmi_iattach(vml->vml_iarg);
+
+	return (0);
 }
 
 /*

==== //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#3 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <sys/mutex.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
+#include <sys/vimage.h>
 #include <vm/uma.h>
 
 /*
@@ -64,6 +65,8 @@
 SYSINIT(domainfin, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST, domainfinalize,
     NULL);
 
+static vnet_attach_fn net_init_domain;
+
 static struct callout pffast_callout;
 static struct callout pfslow_callout;
 
@@ -100,6 +103,14 @@
 	.pru_sopoll =		pru_sopoll_notsupp,
 };
 
+#ifndef VIMAGE_GLOBALS
+vnet_modinfo_t vnet_domain_modinfo = {
+	.vmi_id		= VNET_MOD_DOMAIN,
+	.vmi_name	= "domain",
+	.vmi_iattach	= net_init_domain
+};
+#endif
+
 static void
 protosw_init(struct protosw *pr)
 {
@@ -159,9 +170,10 @@
  * Note: you cant unload it again because a socket may be using it.
  * XXX can't fail at this time.
  */
-static void
-net_init_domain(struct domain *dp)
+static int
+net_init_domain(const void *arg)
 {
+	const struct domain *dp = arg;
 	struct protosw *pr;
 
 	if (dp->dom_init)
@@ -175,6 +187,7 @@
 	max_datalen = MHLEN - max_hdr;
 	if (max_datalen < 1)
 		panic("%s: max_datalen < 1", __func__);
+	return (0);
 }
 
 /*
@@ -210,7 +223,11 @@
 		    "domainfinalize()\n", dp->dom_name);
 #endif
 	mtx_unlock(&dom_mtx);
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register_multi(&vnet_domain_modinfo, dp, dp->dom_name);
+#else
 	net_init_domain(dp);
+#endif
 }
 
 static void

==== //depot/projects/vimage-commit2/src/sys/net/if.c#38 (text+ko) ====

@@ -182,9 +182,13 @@
 	VNET_SYMMAP_END
 };
 
-VNET_MOD_DECLARE(NET, net, vnet_net_iattach, vnet_net_idetach,
-    NONE, vnet_net_symmap)
-#endif
+static const vnet_modinfo_t vnet_net_modinfo = {
+	.vmi_id		= VNET_MOD_NET,
+	.vmi_name	= "net",
+	.vmi_symmap	= vnet_net_symmap,
+	.vmi_iattach	= vnet_net_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
 
 /*
  * System initialization

==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#18 (text+ko) ====

@@ -123,6 +123,15 @@
 static void	gif_clone_destroy(struct ifnet *);
 static int	vnet_gif_iattach(const void *);
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_gif_modinfo = {
+	.vmi_id		= VNET_MOD_GIF,
+	.vmi_name	= "gif",
+	.vmi_dependson	= VNET_MOD_NET,
+	.vmi_iattach	= vnet_gif_iattach
+};
+#endif
+
 IFC_SIMPLE_DECLARE(gif, 0);
 
 static int gifmodevent(module_t, int, void *);
@@ -282,7 +291,12 @@
 	case MOD_LOAD:
 		mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF);
 
+#ifndef VIMAGE_GLOBALS
+		vnet_mod_register(&vnet_gif_modinfo);
+#else
 		vnet_gif_iattach(NULL);
+#endif
+
 		if_clone_attach(&gif_cloner);
 
 		break;

==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#20 (text+ko) ====

@@ -106,6 +106,14 @@
 struct ifnet *loif;			/* Used externally */
 #endif
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_loif_modinfo = {
+	.vmi_id		= VNET_MOD_LOIF,
+	.vmi_name	= "loif",
+	.vmi_iattach	= vnet_loif_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 IFC_SIMPLE_DECLARE(lo, 1);
 
 static void
@@ -150,7 +158,7 @@
 static int vnet_loif_iattach(const void *unused __unused)
 {
 	INIT_VNET_NET(curvnet);
-                         
+
 	V_loif = NULL;
 	if_clone_attach(&lo_cloner);
 	return (0);
@@ -163,7 +171,11 @@
 
 	switch (type) {
 	case MOD_LOAD:
+#ifndef VIMAGE_GLOBALS
+		vnet_mod_register(&vnet_loif_modinfo);
+#else
 		vnet_loif_iattach(NULL);
+#endif
 		break;
 
 	case MOD_UNLOAD:

==== //depot/projects/vimage-commit2/src/sys/net/route.c#30 (text+ko) ====

@@ -108,6 +108,14 @@
 	    struct sockaddr *, struct sockaddr *);
 static int vnet_route_iattach(const void *);
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_rtable_modinfo = {
+	.vmi_id		= VNET_MOD_RTABLE,
+	.vmi_name	= "rtable",
+	.vmi_iattach	= vnet_route_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 /* compare two sockaddr structures */
 #define	sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0)
 
@@ -161,7 +169,11 @@
 		rt_numfibs = 1;
 	rn_init();	/* initialize all zeroes, all ones, mask table */
 
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_rtable_modinfo);
+#else
 	vnet_route_iattach(NULL);
+#endif
 }
 
 static int vnet_route_iattach(const void *unused __unused)

==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#23 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#17 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#11 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#15 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/accf_http.c#2 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#29 (text+ko) ====

@@ -120,6 +120,15 @@
 static void	in_arpinput(struct mbuf *);
 #endif
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_arp_modinfo = {
+	.vmi_id		= VNET_MOD_ARP,
+	.vmi_name	= "arp",
+	.vmi_dependson	= VNET_MOD_INET,
+	.vmi_iattach	= arp_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 #ifdef AF_INET
 void arp_ifscrub(struct ifnet *ifp, uint32_t addr);
 
@@ -808,7 +817,11 @@
 arp_init(void)
 {
 
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_arp_modinfo);
+#else
 	arp_iattach(NULL);
+#endif
 
 	arpintrq.ifq_maxlen = 50;
 	mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF);

==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#20 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#36 (text+ko) ====


==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#30 (text+ko) ====

@@ -224,6 +224,23 @@
 
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
+#ifndef VIMAGE_GLOBALS
+static void vnet_inet_register(void);
+ 
+static const vnet_modinfo_t vnet_inet_modinfo = {
+	.vmi_id		= VNET_MOD_INET,
+	.vmi_name	= "inet",
+};
+ 
+static void vnet_inet_register()
+{
+  
+	vnet_mod_register(&vnet_inet_modinfo);
+}
+ 
+SYSINIT(inet, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, vnet_inet_register, 0);
+#endif
+
 /*
  * IP initialization: fill in IP protocol switch table.
  * All protocols not implemented in kernel go to raw IP protocol handler.

==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#25 (text+ko) ====

@@ -155,6 +155,25 @@
 static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
 #endif
 
+#ifndef VIMAGE_GLOBALS
+static void vnet_inet6_register(void);
+ 
+static const vnet_modinfo_t vnet_inet6_modinfo = {
+	.vmi_id		= VNET_MOD_INET6,
+	.vmi_name	= "inet6",
+	.vmi_dependson	= VNET_MOD_INET	/* XXX revisit - TCP/UDP needs this? */
+};
+ 
+static void
+vnet_inet6_register(void)
+{
+
+	vnet_mod_register(&vnet_inet6_modinfo);
+}
+ 
+SYSINIT(inet6, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, vnet_inet6_register, 0);
+#endif
+
 /*
  * IP6 initialization: fill in IP6 protocol switch table.
  * All protocols not implemented in kernel go to raw IP6 protocol handler.

==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#25 (text+ko) ====

@@ -244,6 +244,15 @@
 
 MALLOC_DEFINE(M_IPSEC_INPCB, "inpcbpolicy", "inpcb-resident ipsec policy");
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_ipsec_modinfo = {
+	.vmi_id		= VNET_MOD_IPSEC,
+	.vmi_name	= "ipsec",
+	.vmi_dependson	= VNET_MOD_INET,	/* XXX revisit - INET6 ? */
+	.vmi_iattach	= ipsec_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 void
 ipsec_init(void)
 {
@@ -1760,7 +1769,12 @@
 ipsec_attach(void)
 {
 
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_ipsec_modinfo);
+#else
 	ipsec_iattach(NULL);
+#endif
+
 }
 
 static int

==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#14 (text+ko) ====

@@ -75,6 +75,15 @@
 
 static int ah_iattach(const void *);
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_ah_modinfo = {
+	.vmi_id		= VNET_MOD_AH,
+	.vmi_name	= "ipsec_ah",
+	.vmi_dependson	= VNET_MOD_IPSEC,
+	.vmi_iattach	= ah_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 /*
  * Return header size in bytes.  The old protocol did not support
  * the replay counter; the new protocol always includes the counter.
@@ -1223,7 +1232,11 @@
 {
 
 	xform_register(&ah_xformsw);
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_ah_modinfo);
+#else
 	ah_iattach(NULL);
+#endif
 }
 
 static int

==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#14 (text+ko) ====

@@ -92,6 +92,15 @@
 static int esp_output_cb(struct cryptop *crp);
 static int esp_iattach(const void *);
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_esp_modinfo = {
+	.vmi_id		= VNET_MOD_ESP,
+	.vmi_name	= "ipsec_esp",
+	.vmi_dependson	= VNET_MOD_IPSEC,
+	.vmi_iattach	= esp_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 /*
  * NB: this is public for use by the PF_KEY support.
  * NB: if you add support here; be sure to add code to esp_attach below!
@@ -993,7 +1002,11 @@
 {
 
 	xform_register(&esp_xformsw);
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_esp_modinfo);
+#else
 	esp_iattach(NULL);
+#endif
 }
 
 static int

==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#12 (text+ko) ====

@@ -82,6 +82,15 @@
 static int ipcomp_output_cb(struct cryptop *crp);
 static int ipcomp_iattach(const void *);
 
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_ipcomp_modinfo = {
+	.vmi_id		= VNET_MOD_IPCOMP,
+	.vmi_name	= "ipsec_ipcomp",
+	.vmi_dependson	= VNET_MOD_IPSEC,
+	.vmi_iattach	= ipcomp_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
+
 struct comp_algo *
 ipcomp_algorithm_lookup(int alg)
 {
@@ -602,7 +611,11 @@
 {
 
 	xform_register(&ipcomp_xformsw);
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_ipcomp_modinfo);
+#else
 	ipcomp_iattach(NULL);
+#endif
 }
 
 static int

==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#15 (text+ko) ====

@@ -108,6 +108,16 @@
 #define	M_IPSEC	(M_AUTHIPHDR|M_AUTHIPDGM|M_DECRYPTED)
 
 static void _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp);
+static int ipe4_iattach(const void *);
+
+#ifndef VIMAGE_GLOBALS
+static const vnet_modinfo_t vnet_ipip_modinfo = {
+	.vmi_id		= VNET_MOD_IPIP,
+	.vmi_name	= "ipsec_ipip",
+	.vmi_dependson	= VNET_MOD_IPSEC,
+	.vmi_iattach	= ipe4_iattach
+};
+#endif /* !VIMAGE_GLOBALS */
 
 #ifdef INET6
 /*
@@ -719,7 +729,11 @@
 	(void) encap_attach_func(AF_INET6, -1,
 		ipe4_encapcheck, (struct protosw *)&ipe6_protosw, NULL);
 #endif
+#ifndef VIMAGE_GLOBALS
+	vnet_mod_register(&vnet_ipip_modinfo);
+#else
 	ipe4_iattach(NULL);
+#endif
 }
 SYSINIT(ipe4_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ipe4_attach, NULL);
 #endif	/* IPSEC */

==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#31 (text+ko) ====

@@ -35,34 +35,94 @@
 
 #include <sys/queue.h>
 
+#if defined(VIMAGE) && defined(VIMAGE_GLOBALS)
+#error "You cannot have both option VIMAGE and option VIMAGE_GLOBALS!"
+#endif
+
+#ifndef VIMAGE_GLOBALS
+
 struct kld_sym_lookup;
 
+typedef int vnet_attach_fn(const void *);
+typedef int vnet_detach_fn(const void *);
+
 struct vnet_symmap {
 	char	*name;
 	void	*base;
 	size_t	size;
 };
+typedef struct vnet_symmap vnet_symmap_t;
 
 struct vnet_modinfo {
+	u_int				 vmi_id;
+	u_int				 vmi_dependson;
 	char				*vmi_name;
+	vnet_attach_fn			*vmi_iattach;
+	vnet_detach_fn			*vmi_idetach;
+	size_t				 vmi_struct_size;
 	struct vnet_symmap		*vmi_symmap;
 };
+typedef struct vnet_modinfo vnet_modinfo_t;
 
 struct vnet_modlink {
-	TAILQ_ENTRY(vnet_modlink)	vml_mod_le;
+	TAILQ_ENTRY(vnet_modlink)	 vml_mod_le;
 	const struct vnet_modinfo	*vml_modinfo;
+	const void			*vml_iarg;
+	const char			*vml_iname;
 };
 
-#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, 	\
-    m_dependson, m_symmap)						\
-	static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = {	\
-		.vmi_name		= #m_name_lc,			\
-		.vmi_symmap		= m_symmap			\
-};
+#define VNET_SYMMAP(mod, name)						\
+	{ #name, &(vnet_ ## mod ## _0._ ## name),			\
+	sizeof(vnet_ ## mod ## _0._ ## name) }
+
+#define VNET_SYMMAP_END		{ NULL, 0 }
+
+/* statefull modules */
+#define VNET_MOD_NET		 0
+#define VNET_MOD_NETGRAPH	 1
+#define VNET_MOD_INET		 2
+#define VNET_MOD_INET6		 3
+#define VNET_MOD_IPSEC		 4
+#define VNET_MOD_IPFW		 5
+#define VNET_MOD_DUMMYNET	 6
+#define VNET_MOD_PF		 7
+#define VNET_MOD_ALTQ		 8
+#define VNET_MOD_IPX		 9
+#define VNET_MOD_ATALK		10
+#define VNET_MOD_ACCF_HTTP	11
+#define VNET_MOD_IGMP		12
+
+/* stateless modules */
+#define VNET_MOD_NG_ETHER	20
+#define VNET_MOD_NG_IFACE	21
+#define VNET_MOD_NG_EIFACE	22
+#define VNET_MOD_ESP		23
+#define VNET_MOD_IPIP		24
+#define VNET_MOD_AH		25
+#define VNET_MOD_IPCOMP	 	26	
+#define VNET_MOD_GIF		27
+#define VNET_MOD_ARP		28
+#define VNET_MOD_RTABLE		29
+#define VNET_MOD_LOIF		30
+#define VNET_MOD_DOMAIN		31
+#define VNET_MOD_DYNAMIC_START	32
+#define VNET_MOD_MAX		64
+
+/* Sysctl virtualization macros need these name mappings bellow */
+#define V_MOD_vnet_net		VNET_MOD_NET
+#define V_MOD_vnet_netgraph	VNET_MOD_NETGRAPH
+#define V_MOD_vnet_inet		VNET_MOD_INET
+#define V_MOD_vnet_inet6	VNET_MOD_INET6
+#define V_MOD_vnet_ipfw		VNET_MOD_IPFW
+#define V_MOD_vnet_pf		VNET_MOD_PF
+#define V_MOD_vnet_gif		VNET_MOD_GIF
+#define V_MOD_vnet_ipsec	VNET_MOD_IPSEC
+
+int	vi_symlookup(struct kld_sym_lookup *, char *);
+void	vnet_mod_register(const struct vnet_modinfo *);
+void	vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *);
 
-#if defined(VIMAGE) && defined(VIMAGE_GLOBALS)
-#error "You cannot have both option VIMAGE and option VIMAGE_GLOBALS!"
-#endif
+#endif /* !VIMAGE_GLOBALS */
 
 #ifdef VIMAGE_GLOBALS
 #define	VSYM(base, sym) (sym)
@@ -74,12 +134,6 @@
 #endif
 #endif
 
-#define VNET_SYMMAP(mod, name)						\
-	{ #name, &(vnet_ ## mod ## _0._ ## name),			\
-	sizeof(vnet_ ## mod ## _0._ ## name) }
-
-#define VNET_SYMMAP_END		{ NULL, 0 }
-
 /* Non-VIMAGE null-macros */
 #define	IS_DEFAULT_VNET(arg) 1
 #define	CURVNET_SET(arg)
@@ -110,9 +164,6 @@
 #define	G_hostname		VPROCG(hostname) /* global hostname */
 #define	V_domainname		VPROCG(domainname)
 
-int	vi_symlookup(struct kld_sym_lookup *, char *);
-void	vnet_mod_register(const struct vnet_modinfo *);
-
 /*
  * Size-guards for the vimage structures.
  * If you need to update the values you MUST increment __FreeBSD_version.

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 07:56:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AF8C1065670; Wed,  1 Apr 2009 07:56:16 +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 39959106566B
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 07:56:16 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 26E258FC14
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 07:56:16 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n317uFq8086320
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 07:56:15 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n317uEwB086318
	for perforce@freebsd.org; Wed, 1 Apr 2009 07:56:14 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 07:56:14 GMT
Message-Id: <200904010756.n317uEwB086318@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160085 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, 01 Apr 2009 07:56:20 -0000

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

Change 160085 by zec@zec_amdx2 on 2009/04/01 07:56:10

	IFC @ 160084

Affected files ...

.. //depot/projects/vimage-commit/src/sys/amd64/acpica/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_switch.S#1 branch
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakecode.S#1 branch
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/genwakecode.sh#1 branch
.. //depot/projects/vimage-commit/src/sys/amd64/acpica/genwakedata.sh#1 branch
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/fpu.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/pmap.h#7 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/arm/arm/locore.S#4 integrate
.. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#6 integrate
.. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/arm/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#8 integrate
.. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/smbios.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/libpc98/time.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/Makefile#5 integrate
.. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/main.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_emul.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/conf/NOTES#12 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files#16 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files.amd64#7 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files.i386#11 integrate
.. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#7 integrate
.. //depot/projects/vimage-commit/src/sys/conf/options#11 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_ec.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/age/if_agereg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/agp/agp_amd64.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/agp/agp_i810.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/agp/agp_intel.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/agp/agp_via.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-via.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/dc/dcphy.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/dc/pnphy.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/ati_pcigart.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_bufs.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_irq.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_linux_list.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_lock.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pci.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_scatter.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/drm_vm.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_dma.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_irq.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_reg.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/i915_suspend.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/mga_irq.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/r600_cp.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_irq.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/ax88x90reg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_wd80x3.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/if_edreg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/fe/if_fe_pccard.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/dev/hptiop/hptiop.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ipmi/ipmi_linux.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo_pci.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/malo/if_malohal.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ofw/openfirm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_subr.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/twa/tw_cl_init.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_pci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci_pci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/image/uscanner.c#2 delete
.. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_defs.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_endian.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_msctest.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_sw_transfer.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpireg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nullfs/null_vnops.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/geom/eli/g_eli.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/label/g_label.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/label/g_label.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/label/g_label_ufs.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_apm.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_bsd.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_mbr.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/part/g_part_pc98.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_list.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_raid5.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_share.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_share.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_state.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/vimage-commit/src/sys/i386/conf/XBOX#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/vimage-commit/src/sys/i386/i386/i686_mem.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/k6_mem.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/vm_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/isa/npx.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/pci/pci_cfgreg.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/ia64/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/imgact_elf.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_environment.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_exec.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_time.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_bus.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_param.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_rtc.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_smp.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sysv_sem.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/mips/include/bus.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/mips/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/Makefile#13 integrate
.. //depot/projects/vimage-commit/src/sys/modules/ath/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/cpufreq/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/dtrace/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/geom/geom_vinum/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/ip6_mroute_mod/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/ip_mroute_mod/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/ipmi/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/linprocfs/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/mii/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/opensolaris/Makefile#3 integrate
.. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#7 integrate
.. //depot/projects/vimage-commit/src/sys/modules/usb/uscanner/Makefile#2 delete
.. //depot/projects/vimage-commit/src/sys/net/if.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_loop.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hostap.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.c#1 branch
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.h#1 branch
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#7 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/igmp.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_kdtrace.c#1 branch
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_kdtrace.h#1 branch
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfsnode.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/pci/intpm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#9 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/powermac/ata_macio.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac_biba/mac_biba.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/security/mac_mls/mac_mls.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/central/central.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#8 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/ebus/ebus.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/fhc/fhc.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/include/trap.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/isa/ofw_isa.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pcib.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/psycho.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/pci/schizo.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sbus/dma_sbus.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sbus/sbus.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sbus/sbusvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/db_disasm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/eeprom.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/jbusppm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/nexus.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/rtc.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/sc_machdep.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/schppm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/trap.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/include/elf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/include/trap.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/trap.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/buf.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/dtrace_bsd.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sys/elf_common.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/sys/imgact.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/jail.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/sys/memrange.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sys/param.h#13 integrate
.. //depot/projects/vimage-commit/src/sys/sys/proc.h#9 integrate
.. //depot/projects/vimage-commit/src/sys/sys/smp.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sys/vnode.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/tools/vnode_if.awk#4 integrate
.. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_extern.h#3 integrate

Differences ...

==== //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ====

@@ -25,31 +25,57 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/sysctl.h>
 
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>
 
 #include <machine/nexusvar.h>
 
+SYSCTL_DECL(_debug_acpi);
+
+int acpi_resume_beep;
+TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
+SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
+    0, "Beep the PC speaker when resuming");
+
+int acpi_reset_video;
+TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
+
 static int intr_model = ACPI_INTR_PIC;
+static struct apm_clone_data acpi_clone;
 
 int
 acpi_machdep_init(device_t dev)
 {
-	struct	acpi_softc *sc;
+	struct acpi_softc	*sc;
 
 	sc = devclass_get_softc(devclass_find("acpi"), 0);
+
+	/* Create a fake clone for /dev/acpi. */
+	STAILQ_INIT(&sc->apm_cdevs);
+	acpi_clone.cdev = sc->acpi_dev_t;
+	acpi_clone.acpi_sc = sc;
+	ACPI_LOCK(acpi);
+	STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries);
+	ACPI_UNLOCK(acpi);
+	sc->acpi_clone = &acpi_clone;
 	acpi_install_wakeup_handler(sc);
 
 	if (intr_model != ACPI_INTR_PIC)
 		acpi_SetIntrModel(intr_model);
 
+	SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
+	    SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
+	    "reset_video", CTLFLAG_RW, &acpi_reset_video, 0,
+	    "Call the VESA reset BIOS vector on the resume path");
+
 	return (0);
 }
 

==== //depot/projects/vimage-commit/src/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ====

@@ -1,6 +1,8 @@
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
+ * Copyright (c) 2003 Peter Wemm
+ * Copyright (c) 2008-2009 Jung-uk Kim <jkim@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,21 +28,411 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
+#include <sys/smp.h>
+#include <sys/types.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
+#include <machine/intr_machdep.h>
+#include <machine/pcb.h>
+#include <machine/pmap.h>
+#include <machine/specialreg.h>
+#include <machine/vmparam.h>
+
+#ifdef SMP
+#include <machine/apicreg.h>
+#include <machine/smp.h>
+#endif
+
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>
 
+#include "acpi_wakecode.h"
+#include "acpi_wakedata.h"
+
+/* Make sure the code is less than a page and leave room for the stack. */
+CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024);
+
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
+#endif
+
+extern int		acpi_resume_beep;
+extern int		acpi_reset_video;
+
+#ifdef SMP
+extern struct xpcb	*stopxpcbs;
+#else
+static struct xpcb	*stopxpcbs;
+#endif
+
+int			acpi_restorecpu(struct xpcb *, vm_offset_t);
+int			acpi_savecpu(struct xpcb *);
+
+static void		acpi_reset_tss(int cpu);
+static void		acpi_alloc_wakeup_handler(void);
+static void		acpi_stop_beep(void *);
+
+#ifdef SMP
+static int		acpi_wakeup_ap(struct acpi_softc *, int);
+static void		acpi_wakeup_cpus(struct acpi_softc *, cpumask_t);
+#endif
+
+#define	WAKECODE_VADDR(sc)	((sc)->acpi_wakeaddr + (3 * PAGE_SIZE))
+#define	WAKECODE_PADDR(sc)	((sc)->acpi_wakephys + (3 * PAGE_SIZE))
+#define	WAKECODE_FIXUP(offset, type, val) do	{	\
+	type	*addr;					\
+	addr = (type *)(WAKECODE_VADDR(sc) + offset);	\
+	*addr = val;					\
+} while (0)
+
+/* Turn off bits 1&2 of the PIT, stopping the beep. */
+static void
+acpi_stop_beep(void *arg)
+{
+	outb(0x61, inb(0x61) & ~0x3);
+}
+
+#ifdef SMP
+static int
+acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
+{
+	int		vector = (WAKECODE_PADDR(sc) >> 12) & 0xff;
+	int		apic_id = cpu_apic_ids[cpu];
+	int		ms;
+
+	WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]);
+	WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit);
+	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
+	    stopxpcbs[cpu].xpcb_gdt.rd_base);
+	WAKECODE_FIXUP(wakeup_cpu, int, cpu);
+
+	acpi_reset_tss(cpu);
+
+	/* do an INIT IPI: assert RESET */
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id);
+
+	/* wait for pending status end */
+	lapic_ipi_wait(-1);
+
+	/* do an INIT IPI: deassert RESET */
+	lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0);
+
+	/* wait for pending status end */
+	DELAY(10000);		/* wait ~10mS */
+	lapic_ipi_wait(-1);
+
+	/*
+	 * next we do a STARTUP IPI: the previous INIT IPI might still be
+	 * latched, (P5 bug) this 1st STARTUP would then terminate
+	 * immediately, and the previously started INIT IPI would continue. OR
+	 * the previous INIT IPI has already run. and this STARTUP IPI will
+	 * run. OR the previous INIT IPI was ignored. and this STARTUP IPI
+	 * will run.
+	 */
+
+	/* do a STARTUP IPI */
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
+	    vector, apic_id);
+	lapic_ipi_wait(-1);
+	DELAY(200);		/* wait ~200uS */
+
+	/*
+	 * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF
+	 * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR
+	 * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is
+	 * recognized after hardware RESET or INIT IPI.
+	 */
+
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
+	    vector, apic_id);
+	lapic_ipi_wait(-1);
+	DELAY(200);		/* wait ~200uS */
+
+	/* Wait up to 5 seconds for it to start. */
+	for (ms = 0; ms < 5000; ms++) {
+		if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0)
+			return (1);	/* return SUCCESS */
+		DELAY(1000);
+	}
+	return (0);		/* return FAILURE */
+}
+
+#define	WARMBOOT_TARGET		0
+#define	WARMBOOT_OFF		(KERNBASE + 0x0467)
+#define	WARMBOOT_SEG		(KERNBASE + 0x0469)
+
+#define	CMOS_REG		(0x70)
+#define	CMOS_DATA		(0x71)
+#define	BIOS_RESET		(0x0f)
+#define	BIOS_WARM		(0x0a)
+
+static void
+acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus)
+{
+	uint32_t	mpbioswarmvec;
+	cpumask_t	map;
+	int		cpu;
+	u_char		mpbiosreason;
+
+	/* save the current value of the warm-start vector */
+	mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF);
+	outb(CMOS_REG, BIOS_RESET);
+	mpbiosreason = inb(CMOS_DATA);
+
+	/* setup a vector to our boot code */
+	*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
+	*((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4;
+	outb(CMOS_REG, BIOS_RESET);
+	outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
+
+	/* Wake up each AP. */
+	for (cpu = 1; cpu < mp_ncpus; cpu++) {
+		map = 1ul << cpu;
+		if ((wakeup_cpus & map) != map)
+			continue;
+		if (acpi_wakeup_ap(sc, cpu) == 0) {
+			/* restore the warmstart vector */
+			*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
+			panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)",
+			    cpu, cpu_apic_ids[cpu]);
+		}
+	}
+
+	/* restore the warmstart vector */
+	*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
+
+	outb(CMOS_REG, BIOS_RESET);
+	outb(CMOS_DATA, mpbiosreason);
+}
+#endif
+
+static void
+acpi_reset_tss(int cpu)
+{
+	uint32_t	*tss;
+
+	/*
+	 * We have to clear "task busy" bit in TSS to restore
+	 * task register later.  Otherwise, ltr causes GPF.
+	 */
+	tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1;
+	*tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8);
+}
+
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
-	return (0);
+	struct savefpu	*stopfpu;
+#ifdef SMP
+	cpumask_t	wakeup_cpus;
+#endif
+	register_t	cr3, rf;
+	ACPI_STATUS	status;
+	int		ret;
+
+	ret = -1;
+
+	if (sc->acpi_wakeaddr == 0ul)
+		return (ret);
+
+#ifdef SMP
+	wakeup_cpus = PCPU_GET(other_cpus);
+#endif
+
+	AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc));
+
+	rf = intr_disable();
+	intr_suspend();
+
+	/*
+	 * Temporarily switch to the kernel pmap because it provides
+	 * an identity mapping (setup at boot) for the low physical
+	 * memory region containing the wakeup code.
+	 */
+	cr3 = rcr3();
+	load_cr3(KPML4phys);
+
+	stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save;
+	if (acpi_savecpu(&stopxpcbs[0])) {
+		fpugetregs(curthread, stopfpu);
+
+#ifdef SMP
+		if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) {
+			device_printf(sc->acpi_dev,
+			    "Failed to suspend APs: CPU mask = 0x%jx\n",
+			    (uintmax_t)(wakeup_cpus & ~stopped_cpus));
+			goto out;
+		}
+#endif
+
+		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
+		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
+
+		WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]);
+		WAKECODE_FIXUP(wakeup_gdt, uint16_t,
+		    stopxpcbs[0].xpcb_gdt.rd_limit);
+		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
+		    stopxpcbs[0].xpcb_gdt.rd_base);
+		WAKECODE_FIXUP(wakeup_cpu, int, 0);
+
+		acpi_reset_tss(0);
+
+		/* Call ACPICA to enter the desired sleep state */
+		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
+			status = AcpiEnterSleepStateS4bios();
+		else
+			status = AcpiEnterSleepState(state);
+
+		if (status != AE_OK) {
+			device_printf(sc->acpi_dev,
+			    "AcpiEnterSleepState failed - %s\n",
+			    AcpiFormatException(status));
+			goto out;
+		}
+
+		for (;;)
+			ia32_pause();
+	} else {
+		fpusetregs(curthread, stopfpu);
+#ifdef SMP
+		if (wakeup_cpus != 0)
+			acpi_wakeup_cpus(sc, wakeup_cpus);
+#endif
+		acpi_resync_clock(sc);
+		ret = 0;
+	}
+
+out:
+#ifdef SMP
+	if (wakeup_cpus != 0)
+		restart_cpus(wakeup_cpus);
+#endif
+
+	load_cr3(cr3);
+	intr_resume();
+	intr_restore(rf);
+
+	AcpiSetFirmwareWakingVector(0);
+
+	if (ret == 0 && mem_range_softc.mr_op != NULL &&
+	    mem_range_softc.mr_op->reinit != NULL)
+		mem_range_softc.mr_op->reinit(&mem_range_softc);
+
+	/* If we beeped, turn it off after a delay. */
+	if (acpi_resume_beep)
+		timeout(acpi_stop_beep, NULL, 3 * hz);
+
+	return (ret);
+}
+
+static vm_offset_t	acpi_wakeaddr;
+
+static void
+acpi_alloc_wakeup_handler(void)
+{
+	void		*wakeaddr;
+
+	if (!cold)
+		return;
+
+	/*
+	 * Specify the region for our wakeup code.  We want it in the low 1 MB
+	 * region, excluding video memory and above (0xa0000).  We ask for
+	 * it to be page-aligned, just to be safe.
+	 */
+	wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff,
+	    PAGE_SIZE, 0ul);
+	if (wakeaddr == NULL) {
+		printf("%s: can't alloc wake memory\n", __func__);
+		return;
+	}
+	stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT);
+	if (stopxpcbs == NULL) {
+		contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF);
+		printf("%s: can't alloc CPU state memory\n", __func__);
+		return;
+	}
+	acpi_wakeaddr = (vm_offset_t)wakeaddr;
 }
 
+SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0);
+
 void
 acpi_install_wakeup_handler(struct acpi_softc *sc)
 {
+	uint64_t	*pt4, *pt3, *pt2;
+	int		i;
+
+	if (acpi_wakeaddr == 0ul)
+		return;
+
+	sc->acpi_wakeaddr = acpi_wakeaddr;
+	sc->acpi_wakephys = vtophys(acpi_wakeaddr);
+
+	bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode));
+
+	/* Patch GDT base address, ljmp targets and page table base address. */
+	WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t,
+	    WAKECODE_PADDR(sc) + bootgdt);
+	WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t,
+	    WAKECODE_PADDR(sc) + wakeup_32);
+	WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t,
+	    WAKECODE_PADDR(sc) + wakeup_64);
+	WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys);
+
+	/* Save pointers to some global data. */
+	WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu);
+	WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys);
+	WAKECODE_FIXUP(wakeup_ctx, vm_offset_t,
+	    WAKECODE_VADDR(sc) + wakeup_ctx);
+	WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER));
+	WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT));
+	WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR));
+	WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR));
+	WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR));
+	WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK));
+
+	/* Build temporary page tables below realmode code. */
+	pt4 = (uint64_t *)acpi_wakeaddr;
+	pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t);
+	pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t);
+
+	/* Create the initial 1GB replicated page tables */
+	for (i = 0; i < 512; i++) {
+		/*
+		 * Each slot of the level 4 pages points
+		 * to the same level 3 page
+		 */
+		pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE);
+		pt4[i] |= PG_V | PG_RW | PG_U;
+
+		/*
+		 * Each slot of the level 3 pages points
+		 * to the same level 2 page
+		 */
+		pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE));
+		pt3[i] |= PG_V | PG_RW | PG_U;
+
+		/* The level 2 page slots are mapped with 2MB pages for 1GB. */
+		pt2[i] = i * (2 * 1024 * 1024);
+		pt2[i] |= PG_V | PG_RW | PG_PS | PG_U;
+	}
+
+	if (bootverbose)
+		device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n",
+		    (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys);
 }

==== //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -73,11 +73,13 @@
 static int	amd64_mrset(struct mem_range_softc *sc,
 		    struct mem_range_desc *mrd, int *arg);
 static void	amd64_mrAPinit(struct mem_range_softc *sc);
+static void	amd64_mrreinit(struct mem_range_softc *sc);
 
 static struct mem_range_ops amd64_mrops = {
 	amd64_mrinit,
 	amd64_mrset,
-	amd64_mrAPinit
+	amd64_mrAPinit,
+	amd64_mrreinit
 };
 
 /* XXX for AP startup hook */
@@ -668,6 +670,30 @@
 	wrmsr(MSR_MTRRdefType, mtrrdef);
 }
 
+/*
+ * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor
+ * list.
+ *
+ * XXX Must be called with interrupts enabled.
+ */
+static void
+amd64_mrreinit(struct mem_range_softc *sc)
+{
+#ifdef SMP
+	/*
+	 * We should use ipi_all_but_self() to call other CPUs into a
+	 * locking gate, then call a target function to do this work.
+	 * The "proper" solution involves a generalised locking gate
+	 * implementation, not ready yet.
+	 */
+	smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc);
+#else
+	disable_intr();				/* disable interrupts */
+	amd64_mrAPinit(sc);
+	enable_intr();
+#endif
+}
+
 static void
 amd64_mem_drvinit(void *unused)
 {

==== //depot/projects/vimage-commit/src/sys/amd64/amd64/apic_vector.S#3 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $
  */
 
 /*
@@ -224,6 +224,22 @@
 	iretq
 
 /*
+ * Executed by a CPU when it receives an IPI_SUSPEND from another CPU.
+ */
+	.text
+	SUPERALIGN_TEXT
+IDTVEC(cpususpend)
+	PUSH_FRAME

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

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 08:08:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07DBD1065672; Wed,  1 Apr 2009 08:08:30 +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 A2F85106566B
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 08:08:29 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FA998FC0C
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 08:08:29 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3188Tth088137
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 08:08:29 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3188SAN088135
	for perforce@freebsd.org; Wed, 1 Apr 2009 08:08:28 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 08:08:28 GMT
Message-Id: <200904010808.n3188SAN088135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160086 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, 01 Apr 2009 08:08:31 -0000

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

Change 160086 by zec@zec_amdx2 on 2009/04/01 08:07:50

	IFC @ 160084

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_switch.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakecode.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/genwakecode.sh#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/acpica/genwakedata.sh#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#11 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/atomic.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/libpc98/time.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/main.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_emul.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#18 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#25 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#10 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.i386#15 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#6 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options#22 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/age/if_agereg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_amd64.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_intel.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_via.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/dc/dcphy.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/dc/pnphy.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/ati_pcigart.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_linux_list.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_vm.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_reg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_suspend.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_irq.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/ax88x90reg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fe/if_fe_pccard.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hptiop/hptiop.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_linux.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_subr.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/image/uscanner.c#3 delete
.. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_defs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_endian.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#21 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/eli/g_eli.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/label/g_label_ufs.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_apm.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_mbr.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_list.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#12 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/XBOX#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/i386/i386/i686_mem.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/k6_mem.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_time.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/bus.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#17 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ath/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/dtrace/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/geom/geom_vinum/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ip6_mroute_mod/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ip_mroute_mod/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ipmi/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/mii/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#6 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/usb/uscanner/Makefile#2 delete
.. //depot/projects/vimage-commit2/src/sys/net/if.c#39 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tap.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#43 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_kdtrace.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_kdtrace.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsnode.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#8 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/intpm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#8 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/central/central.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/fhc/fhc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/trap.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/isa/ofw_isa.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/apb.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psycho.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizo.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/dma_sbus.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/sbusvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/db_disasm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/eeprom.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/jbusppm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/rtc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/sc_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/schppm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/elf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/trap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/buf.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/dtrace_bsd.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/elf_common.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/imgact.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/jail.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/memrange.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#29 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/smp.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/tools/vnode_if.awk#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_extern.h#2 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ====

@@ -25,31 +25,57 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/sysctl.h>
 
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>
 
 #include <machine/nexusvar.h>
 
+SYSCTL_DECL(_debug_acpi);
+
+int acpi_resume_beep;
+TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
+SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
+    0, "Beep the PC speaker when resuming");
+
+int acpi_reset_video;
+TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
+
 static int intr_model = ACPI_INTR_PIC;
+static struct apm_clone_data acpi_clone;
 
 int
 acpi_machdep_init(device_t dev)
 {
-	struct	acpi_softc *sc;
+	struct acpi_softc	*sc;
 
 	sc = devclass_get_softc(devclass_find("acpi"), 0);
+
+	/* Create a fake clone for /dev/acpi. */
+	STAILQ_INIT(&sc->apm_cdevs);
+	acpi_clone.cdev = sc->acpi_dev_t;
+	acpi_clone.acpi_sc = sc;
+	ACPI_LOCK(acpi);
+	STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries);
+	ACPI_UNLOCK(acpi);
+	sc->acpi_clone = &acpi_clone;
 	acpi_install_wakeup_handler(sc);
 
 	if (intr_model != ACPI_INTR_PIC)
 		acpi_SetIntrModel(intr_model);
 
+	SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
+	    SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
+	    "reset_video", CTLFLAG_RW, &acpi_reset_video, 0,
+	    "Call the VESA reset BIOS vector on the resume path");
+
 	return (0);
 }
 

==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ====

@@ -1,6 +1,8 @@
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
+ * Copyright (c) 2003 Peter Wemm
+ * Copyright (c) 2008-2009 Jung-uk Kim <jkim@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,21 +28,411 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
+#include <sys/smp.h>
+#include <sys/types.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
+#include <machine/intr_machdep.h>
+#include <machine/pcb.h>
+#include <machine/pmap.h>
+#include <machine/specialreg.h>
+#include <machine/vmparam.h>
+
+#ifdef SMP
+#include <machine/apicreg.h>
+#include <machine/smp.h>
+#endif
+
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>
 
+#include "acpi_wakecode.h"
+#include "acpi_wakedata.h"
+
+/* Make sure the code is less than a page and leave room for the stack. */
+CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024);
+
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
+#endif
+
+extern int		acpi_resume_beep;
+extern int		acpi_reset_video;
+
+#ifdef SMP
+extern struct xpcb	*stopxpcbs;
+#else
+static struct xpcb	*stopxpcbs;
+#endif
+
+int			acpi_restorecpu(struct xpcb *, vm_offset_t);
+int			acpi_savecpu(struct xpcb *);
+
+static void		acpi_reset_tss(int cpu);
+static void		acpi_alloc_wakeup_handler(void);
+static void		acpi_stop_beep(void *);
+
+#ifdef SMP
+static int		acpi_wakeup_ap(struct acpi_softc *, int);
+static void		acpi_wakeup_cpus(struct acpi_softc *, cpumask_t);
+#endif
+
+#define	WAKECODE_VADDR(sc)	((sc)->acpi_wakeaddr + (3 * PAGE_SIZE))
+#define	WAKECODE_PADDR(sc)	((sc)->acpi_wakephys + (3 * PAGE_SIZE))
+#define	WAKECODE_FIXUP(offset, type, val) do	{	\
+	type	*addr;					\
+	addr = (type *)(WAKECODE_VADDR(sc) + offset);	\
+	*addr = val;					\
+} while (0)
+
+/* Turn off bits 1&2 of the PIT, stopping the beep. */
+static void
+acpi_stop_beep(void *arg)
+{
+	outb(0x61, inb(0x61) & ~0x3);
+}
+
+#ifdef SMP
+static int
+acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
+{
+	int		vector = (WAKECODE_PADDR(sc) >> 12) & 0xff;
+	int		apic_id = cpu_apic_ids[cpu];
+	int		ms;
+
+	WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]);
+	WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit);
+	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
+	    stopxpcbs[cpu].xpcb_gdt.rd_base);
+	WAKECODE_FIXUP(wakeup_cpu, int, cpu);
+
+	acpi_reset_tss(cpu);
+
+	/* do an INIT IPI: assert RESET */
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id);
+
+	/* wait for pending status end */
+	lapic_ipi_wait(-1);
+
+	/* do an INIT IPI: deassert RESET */
+	lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0);
+
+	/* wait for pending status end */
+	DELAY(10000);		/* wait ~10mS */
+	lapic_ipi_wait(-1);
+
+	/*
+	 * next we do a STARTUP IPI: the previous INIT IPI might still be
+	 * latched, (P5 bug) this 1st STARTUP would then terminate
+	 * immediately, and the previously started INIT IPI would continue. OR
+	 * the previous INIT IPI has already run. and this STARTUP IPI will
+	 * run. OR the previous INIT IPI was ignored. and this STARTUP IPI
+	 * will run.
+	 */
+
+	/* do a STARTUP IPI */
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
+	    vector, apic_id);
+	lapic_ipi_wait(-1);
+	DELAY(200);		/* wait ~200uS */
+
+	/*
+	 * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF
+	 * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR
+	 * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is
+	 * recognized after hardware RESET or INIT IPI.
+	 */
+
+	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
+	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
+	    vector, apic_id);
+	lapic_ipi_wait(-1);
+	DELAY(200);		/* wait ~200uS */
+
+	/* Wait up to 5 seconds for it to start. */
+	for (ms = 0; ms < 5000; ms++) {
+		if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0)
+			return (1);	/* return SUCCESS */
+		DELAY(1000);
+	}
+	return (0);		/* return FAILURE */
+}
+
+#define	WARMBOOT_TARGET		0
+#define	WARMBOOT_OFF		(KERNBASE + 0x0467)
+#define	WARMBOOT_SEG		(KERNBASE + 0x0469)
+
+#define	CMOS_REG		(0x70)
+#define	CMOS_DATA		(0x71)
+#define	BIOS_RESET		(0x0f)
+#define	BIOS_WARM		(0x0a)
+
+static void
+acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus)
+{
+	uint32_t	mpbioswarmvec;
+	cpumask_t	map;
+	int		cpu;
+	u_char		mpbiosreason;
+
+	/* save the current value of the warm-start vector */
+	mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF);
+	outb(CMOS_REG, BIOS_RESET);
+	mpbiosreason = inb(CMOS_DATA);
+
+	/* setup a vector to our boot code */
+	*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
+	*((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4;
+	outb(CMOS_REG, BIOS_RESET);
+	outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
+
+	/* Wake up each AP. */
+	for (cpu = 1; cpu < mp_ncpus; cpu++) {
+		map = 1ul << cpu;
+		if ((wakeup_cpus & map) != map)
+			continue;
+		if (acpi_wakeup_ap(sc, cpu) == 0) {
+			/* restore the warmstart vector */
+			*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
+			panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)",
+			    cpu, cpu_apic_ids[cpu]);
+		}
+	}
+
+	/* restore the warmstart vector */
+	*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
+
+	outb(CMOS_REG, BIOS_RESET);
+	outb(CMOS_DATA, mpbiosreason);
+}
+#endif
+
+static void
+acpi_reset_tss(int cpu)
+{
+	uint32_t	*tss;
+
+	/*
+	 * We have to clear "task busy" bit in TSS to restore
+	 * task register later.  Otherwise, ltr causes GPF.
+	 */
+	tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1;
+	*tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8);
+}
+
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
-	return (0);
+	struct savefpu	*stopfpu;
+#ifdef SMP
+	cpumask_t	wakeup_cpus;
+#endif
+	register_t	cr3, rf;
+	ACPI_STATUS	status;
+	int		ret;
+
+	ret = -1;
+
+	if (sc->acpi_wakeaddr == 0ul)
+		return (ret);
+
+#ifdef SMP
+	wakeup_cpus = PCPU_GET(other_cpus);
+#endif
+
+	AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc));
+
+	rf = intr_disable();
+	intr_suspend();
+
+	/*
+	 * Temporarily switch to the kernel pmap because it provides
+	 * an identity mapping (setup at boot) for the low physical
+	 * memory region containing the wakeup code.
+	 */
+	cr3 = rcr3();
+	load_cr3(KPML4phys);
+
+	stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save;
+	if (acpi_savecpu(&stopxpcbs[0])) {
+		fpugetregs(curthread, stopfpu);
+
+#ifdef SMP
+		if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) {
+			device_printf(sc->acpi_dev,
+			    "Failed to suspend APs: CPU mask = 0x%jx\n",
+			    (uintmax_t)(wakeup_cpus & ~stopped_cpus));
+			goto out;
+		}
+#endif
+
+		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
+		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
+
+		WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]);
+		WAKECODE_FIXUP(wakeup_gdt, uint16_t,
+		    stopxpcbs[0].xpcb_gdt.rd_limit);
+		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
+		    stopxpcbs[0].xpcb_gdt.rd_base);
+		WAKECODE_FIXUP(wakeup_cpu, int, 0);
+
+		acpi_reset_tss(0);
+
+		/* Call ACPICA to enter the desired sleep state */
+		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
+			status = AcpiEnterSleepStateS4bios();
+		else
+			status = AcpiEnterSleepState(state);
+
+		if (status != AE_OK) {
+			device_printf(sc->acpi_dev,
+			    "AcpiEnterSleepState failed - %s\n",
+			    AcpiFormatException(status));
+			goto out;
+		}
+
+		for (;;)
+			ia32_pause();
+	} else {
+		fpusetregs(curthread, stopfpu);
+#ifdef SMP
+		if (wakeup_cpus != 0)
+			acpi_wakeup_cpus(sc, wakeup_cpus);
+#endif
+		acpi_resync_clock(sc);
+		ret = 0;
+	}
+
+out:
+#ifdef SMP
+	if (wakeup_cpus != 0)
+		restart_cpus(wakeup_cpus);
+#endif
+
+	load_cr3(cr3);
+	intr_resume();
+	intr_restore(rf);
+
+	AcpiSetFirmwareWakingVector(0);
+
+	if (ret == 0 && mem_range_softc.mr_op != NULL &&
+	    mem_range_softc.mr_op->reinit != NULL)
+		mem_range_softc.mr_op->reinit(&mem_range_softc);
+
+	/* If we beeped, turn it off after a delay. */
+	if (acpi_resume_beep)
+		timeout(acpi_stop_beep, NULL, 3 * hz);
+
+	return (ret);
+}
+
+static vm_offset_t	acpi_wakeaddr;
+
+static void
+acpi_alloc_wakeup_handler(void)
+{
+	void		*wakeaddr;
+
+	if (!cold)
+		return;
+
+	/*
+	 * Specify the region for our wakeup code.  We want it in the low 1 MB
+	 * region, excluding video memory and above (0xa0000).  We ask for
+	 * it to be page-aligned, just to be safe.
+	 */
+	wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff,
+	    PAGE_SIZE, 0ul);
+	if (wakeaddr == NULL) {
+		printf("%s: can't alloc wake memory\n", __func__);
+		return;
+	}
+	stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT);
+	if (stopxpcbs == NULL) {
+		contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF);
+		printf("%s: can't alloc CPU state memory\n", __func__);
+		return;
+	}
+	acpi_wakeaddr = (vm_offset_t)wakeaddr;
 }
 
+SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0);
+
 void
 acpi_install_wakeup_handler(struct acpi_softc *sc)
 {
+	uint64_t	*pt4, *pt3, *pt2;
+	int		i;
+
+	if (acpi_wakeaddr == 0ul)
+		return;
+
+	sc->acpi_wakeaddr = acpi_wakeaddr;
+	sc->acpi_wakephys = vtophys(acpi_wakeaddr);
+
+	bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode));
+
+	/* Patch GDT base address, ljmp targets and page table base address. */
+	WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t,
+	    WAKECODE_PADDR(sc) + bootgdt);
+	WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t,
+	    WAKECODE_PADDR(sc) + wakeup_32);
+	WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t,
+	    WAKECODE_PADDR(sc) + wakeup_64);
+	WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys);
+
+	/* Save pointers to some global data. */
+	WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu);
+	WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys);
+	WAKECODE_FIXUP(wakeup_ctx, vm_offset_t,
+	    WAKECODE_VADDR(sc) + wakeup_ctx);
+	WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER));
+	WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT));
+	WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR));
+	WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR));
+	WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR));
+	WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK));
+
+	/* Build temporary page tables below realmode code. */
+	pt4 = (uint64_t *)acpi_wakeaddr;
+	pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t);
+	pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t);
+
+	/* Create the initial 1GB replicated page tables */
+	for (i = 0; i < 512; i++) {
+		/*
+		 * Each slot of the level 4 pages points
+		 * to the same level 3 page
+		 */
+		pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE);
+		pt4[i] |= PG_V | PG_RW | PG_U;
+
+		/*
+		 * Each slot of the level 3 pages points
+		 * to the same level 2 page
+		 */
+		pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE));
+		pt3[i] |= PG_V | PG_RW | PG_U;
+
+		/* The level 2 page slots are mapped with 2MB pages for 1GB. */
+		pt2[i] = i * (2 * 1024 * 1024);
+		pt2[i] |= PG_V | PG_RW | PG_PS | PG_U;
+	}
+
+	if (bootverbose)
+		device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n",
+		    (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys);
 }

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -73,11 +73,13 @@
 static int	amd64_mrset(struct mem_range_softc *sc,
 		    struct mem_range_desc *mrd, int *arg);
 static void	amd64_mrAPinit(struct mem_range_softc *sc);
+static void	amd64_mrreinit(struct mem_range_softc *sc);
 
 static struct mem_range_ops amd64_mrops = {
 	amd64_mrinit,
 	amd64_mrset,
-	amd64_mrAPinit
+	amd64_mrAPinit,
+	amd64_mrreinit
 };
 
 /* XXX for AP startup hook */
@@ -668,6 +670,30 @@
 	wrmsr(MSR_MTRRdefType, mtrrdef);
 }
 
+/*
+ * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor
+ * list.
+ *
+ * XXX Must be called with interrupts enabled.
+ */
+static void
+amd64_mrreinit(struct mem_range_softc *sc)
+{
+#ifdef SMP
+	/*
+	 * We should use ipi_all_but_self() to call other CPUs into a
+	 * locking gate, then call a target function to do this work.
+	 * The "proper" solution involves a generalised locking gate
+	 * implementation, not ready yet.
+	 */
+	smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc);
+#else
+	disable_intr();				/* disable interrupts */
+	amd64_mrAPinit(sc);
+	enable_intr();
+#endif
+}
+
 static void
 amd64_mem_drvinit(void *unused)
 {

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/apic_vector.S#2 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $
  */
 
 /*
@@ -224,6 +224,22 @@
 	iretq
 
 /*
+ * Executed by a CPU when it receives an IPI_SUSPEND from another CPU.
+ */
+	.text
+	SUPERALIGN_TEXT
+IDTVEC(cpususpend)
+	PUSH_FRAME

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

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 08:11:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D498106568C; Wed,  1 Apr 2009 08:11:34 +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 37588106568A
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 08:11:34 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 249688FC24
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 08:11:34 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n318BXNN088430
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 08:11:33 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n318BWKX088424
	for perforce@freebsd.org; Wed, 1 Apr 2009 08:11:32 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 08:11:32 GMT
Message-Id: <200904010811.n318BWKX088424@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160087 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, 01 Apr 2009 08:11:35 -0000

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

Change 160087 by zec@zec_tpx32 on 2009/04/01 08:10:48

	IFC @ 160084

Affected files ...

.. //depot/projects/vimage/src/share/man/man3/pthread.3#2 integrate
.. //depot/projects/vimage/src/share/man/man4/Makefile#6 integrate
.. //depot/projects/vimage/src/share/man/man4/ath.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/ed.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/lagg.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/lo.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/malo.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/fe.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/pccbb.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/usb.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/uscanner.4#3 delete
.. //depot/projects/vimage/src/share/man/man4/wlan.4#2 integrate
.. //depot/projects/vimage/src/share/man/man5/devfs.rules.5#2 integrate
.. //depot/projects/vimage/src/share/man/man8/nanobsd.8#2 integrate
.. //depot/projects/vimage/src/share/man/man9/Makefile#4 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_ATTRIB.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_CREATE.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_INACTIVE.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_IOCTL.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_LINK.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_LOCK.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_LOOKUP.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_OPENCLOSE.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_RDWR.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_READDIR.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_READLINK.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_REMOVE.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_RENAME.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#3 integrate
.. //depot/projects/vimage/src/share/man/man9/bus_dma.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/refcount.9#1 branch
.. //depot/projects/vimage/src/sys/amd64/acpica/Makefile#1 branch
.. //depot/projects/vimage/src/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/amd64/acpica/acpi_switch.S#1 branch
.. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakecode.S#1 branch
.. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/acpica/genwakecode.sh#1 branch
.. //depot/projects/vimage/src/sys/amd64/acpica/genwakedata.sh#1 branch
.. //depot/projects/vimage/src/sys/amd64/amd64/amd64_mem.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#13 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#12 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#17 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#27 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#27 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/NOTES#17 integrate
.. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#7 integrate
.. //depot/projects/vimage/src/sys/amd64/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pcb.h#7 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pmap.h#9 integrate
.. //depot/projects/vimage/src/sys/amd64/include/smp.h#7 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#11 integrate
.. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/arm/locore.S#7 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#15 integrate
.. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#5 integrate
.. //depot/projects/vimage/src/sys/arm/conf/HL200#7 integrate
.. //depot/projects/vimage/src/sys/arm/conf/KB920X#11 integrate
.. //depot/projects/vimage/src/sys/arm/include/atomic.h#7 integrate
.. //depot/projects/vimage/src/sys/arm/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#18 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/smbios.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/time.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/loader/main.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#19 integrate
.. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#9 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#35 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#6 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#14 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#8 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#6 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#6 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#44 integrate
.. //depot/projects/vimage/src/sys/conf/files#59 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#22 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#29 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#19 integrate
.. //depot/projects/vimage/src/sys/conf/newvers.sh#8 integrate
.. //depot/projects/vimage/src/sys/conf/options#44 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/age/if_age.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/age/if_agereg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#21 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#32 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#20 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#13 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#25 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/dc/dcphy.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/dc/pnphy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drmP.h#10 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_linux_list.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_reg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_suspend.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_irq.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ed/ax88x90reg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/fe/if_fe_pccard.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_linux.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/malo/if_malo.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/malo/if_malo_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#18 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/my/if_my.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#11 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560var.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2661var.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/re/if_re.c#24 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#30 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_subr.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_init.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#4 delete
.. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_util.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#46 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpireg.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#12 integrate
.. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/vimage/src/sys/geom/label/g_label_ufs.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part.c#16 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#10 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#11 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#11 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#5 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_list.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#31 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#29 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XBOX#9 integrate
.. //depot/projects/vimage/src/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/vimage/src/sys/i386/i386/i686_mem.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/k6_mem.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#18 integrate
.. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/i386/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#10 integrate
.. //depot/projects/vimage/src/sys/i386/isa/npx.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#7 integrate
.. //depot/projects/vimage/src/sys/ia64/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_elf.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/kern_environment.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/kern_poll.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_time.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/subr_param.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/subr_rtc.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_sem.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#27 integrate
.. //depot/projects/vimage/src/sys/mips/include/bus.h#2 integrate
.. //depot/projects/vimage/src/sys/mips/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#42 integrate
.. //depot/projects/vimage/src/sys/modules/ath/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/dtrace/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/dtrace/dtnfsclient/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/geom/geom_vinum/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/ip6_mroute_mod/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ip_mroute_mod/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/modules/ipmi/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/ipmi/ipmi_linux/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/mii/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#10 integrate
.. //depot/projects/vimage/src/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb/Makefile#8 integrate
.. //depot/projects/vimage/src/sys/modules/usb/uscanner/Makefile#2 delete
.. //depot/projects/vimage/src/sys/net/if.c#71 integrate
.. //depot/projects/vimage/src/sys/net/if_bridge.c#26 integrate
.. //depot/projects/vimage/src/sys/net/if_loop.c#39 integrate
.. //depot/projects/vimage/src/sys/net/if_tap.c#12 integrate
.. //depot/projects/vimage/src/sys/net/if_var.h#30 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#30 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.h#13 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#20 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#19 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#15 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#15 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.h#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#21 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#20 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#13 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#19 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#15 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.c#1 branch
.. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.h#1 branch
.. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.h#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#22 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#29 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet/in_mcast.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#52 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.h#28 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_mroute.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#50 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#76 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.h#5 integrate
.. //depot/projects/vimage/src/sys/netinet6/mld6.c#20 integrate
.. //depot/projects/vimage/src/sys/netipsec/key.c#38 integrate
.. //depot/projects/vimage/src/sys/netnatm/natm.c#4 integrate
.. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs.h#7 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#10 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_kdtrace.c#1 branch
.. //depot/projects/vimage/src/sys/nfsclient/nfs_kdtrace.h#1 branch
.. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#31 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#7 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/NOTES#12 integrate
.. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/pci/intpm.c#9 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#20 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#15 integrate
.. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#18 integrate
.. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#17 integrate
.. //depot/projects/vimage/src/sys/sparc64/central/central.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#20 integrate
.. //depot/projects/vimage/src/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/fhc/fhc.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/trap.h#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/isa/ofw_isa.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/apb.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#9 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#15 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psychovar.h#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sbus/dma_sbus.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#10 integrate
.. //depot/projects/vimage/src/sys/sparc64/sbus/sbusvar.h#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/db_disasm.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/eeprom.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/jbusppm.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/nexus.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/rtc.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/sc_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/schppm.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#10 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/upa.c#6 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#17 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/elf.h#3 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/trap.h#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#8 integrate
.. //depot/projects/vimage/src/sys/sys/buf.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/dtrace_bsd.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/elf_common.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/imgact.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/memrange.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#45 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#29 integrate
.. //depot/projects/vimage/src/sys/sys/smp.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#20 integrate
.. //depot/projects/vimage/src/sys/tools/vnode_if.awk#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#3 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man3/pthread.3#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.31 2007/10/22 10:07:59 ru Exp $
+.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.32 2009/04/01 07:13:21 trhodes Exp $
 .\"
-.Dd October 19, 2007
+.Dd April 1, 2009
 .Dt PTHREAD 3
 .Os
 .Sh NAME
@@ -469,15 +469,15 @@
 .Sh IMPLEMENTATION NOTES
 The current
 .Fx
-POSIX thread implementation is built in two libraries,
+POSIX thread implementation is built into the
 .Lb libthr ,
-and
-.Lb libkse .
-They contain both thread-safe versions of
+library.
+It contains thread-safe versions of
 .Lb libc
 functions and the thread functions.
-Threaded applications are linked with one of these libraries.
+Threaded applications are linked with this library.
 .Sh SEE ALSO
+.Xr libthr 3 ,
 .Xr pthread_atfork 3 ,
 .Xr pthread_cancel 3 ,
 .Xr pthread_cleanup_pop 3 ,

==== //depot/projects/vimage/src/share/man/man4/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.443 2009/03/13 16:42:24 rpaulo Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.444 2009/03/19 20:33:26 thompsa Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -422,7 +422,6 @@
 	urio.4 \
 	${_urtw.4} \
 	usb.4 \
-	uscanner.4 \
 	uslcom.4 \
 	utopia.4 \
 	uvisor.4 \

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

@@ -26,9 +26,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/ath.4,v 1.46 2009/01/13 23:57:15 sam Exp $
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.47 2009/03/25 21:20:19 sam Exp $
 .\"/
-.Dd January 13, 2009
+.Dd March 25, 2009
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -59,8 +59,6 @@
 the Atheros AR5210, AR5211, AR5212, and AR5416 programming APIs.
 These APIs are used by a wide variety of chips; most all chips with
 a PCI and/or CardBus interface are supported.
-Chip-specific support is provided by the Atheros Hardware Access Layer
-(HAL).
 .Pp
 Supported features include 802.11 and 802.3 frames, power management, BSS,
 IBSS, TDMA, and host-based access point operation modes.
@@ -129,7 +127,7 @@
 .Cm tdma
 operation when compiled with
 .Cd "options AH_SUPPORT_TDMA"
-(and the wlan module is build with
+(and the wlan module is built with
 .Cd "options IEEE80211_SUPPORT_TDMA"
 to enable the associated 802.11 support).
 For more information on configuring this device, see
@@ -142,10 +140,8 @@
 .Sh HARDWARE
 The
 .Nm
-driver supports most Atheros Cardbus or PCI cards,
+driver supports all Atheros Cardbus and PCI cards,
 except those that are based on the AR5005VL chipset.
-More recent parts may require a hal that is not part of
-.Fb .
 .Pp
 A list of cards that are supported can be found at
 .Pa http://customerproducts.atheros.com/customerproducts/default.asp .
@@ -252,13 +248,6 @@
 The Atheros Hardware Access Layer was unable to reset the hardware
 when switching channels during scanning.
 This should not happen.
-.It "ath%d: unable to allocate channel table"
-The driver was unable to allocate memory for the table used to hold
-the set of available channels.
-.It "ath%d: unable to collect channel list from hal"
-A problem occurred while querying the HAL to find the set of available
-channels for the device.
-This should not happen.
 .It "ath%d: failed to enable memory mapping"
 The driver was unable to enable memory-mapped I/O to the PCI device registers.
 This should not happen.
@@ -294,15 +283,6 @@
 device driver first appeared in
 .Fx 5.2 .
 .Sh CAVEATS
-Different regulatory domains have different default channels for adhoc
-mode.
-See
-.Xr ifconfig 8
-for information on how to change the channel.
-Different regulatory domains may not be able to communicate with each
-other with 802.11a as different regulatory domains do not necessarily
-have overlapping channels.
-.Pp
 Revision A1 of the D-LINK DWL-G520 and DWL-G650 are based on an
 Intersil PrismGT chip and are not supported by this driver.
 .Sh BUGS

==== //depot/projects/vimage/src/share/man/man4/ath_hal.4#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
+.\" Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
 .\" All rights reserved.
 .\""
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,9 +26,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.12 2008/12/01 16:53:01 sam Exp $
+.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.13 2009/03/25 21:20:19 sam Exp $
 .\"/
-.Dd November 30, 2008
+.Dd March 25, 2009
 .Dt ATH_HAL 4
 .Os
 .Sh NAME
@@ -52,10 +52,13 @@
 .\".Cd "device ath_rf2136"
 .\".Cd "device ath_rf2137"
 .Cd "device ath_ar9160"
+.Cd "device ath_ar9280"
 .Cd "options AH_SUPPORT_AR5416"
 .Sh DESCRIPTION
 The hal provides hardware support for wireless network adapters based on
-the Atheros AR5210, AR5211, AR5212, AR5416, and AR9160 chips.
+the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425,
+AR5413, AR5416, AR5418, AR5424, AR9160, and AR9280 chips (and companion
+RF/baseband parts).
 This code is part of the
 .Xr ath 4
 driver but configured separately to allow fine-grained control
@@ -63,7 +66,8 @@
 Selecting
 .Nm
 enables support for all PCI and Cardbus devices.
-Note this includes AR5416 devices and must be accompanied by the
+Note this includes AR5416, AR9160, and AR9280 devices and
+must be accompanied by the
 AH_SUPPORT_AR5416
 option to enable the extended hardware descriptor format used by
 AR5416 and later devices.

==== //depot/projects/vimage/src/share/man/man4/ed.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ed.4,v 1.58 2008/07/06 06:24:02 imp Exp $
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.59 2009/03/28 20:59:25 imp Exp $
 .\"
-.Dd January 27, 2008
+.Dd March 28, 2009
 .Dt ED 4
 .Os
 .Sh NAME
@@ -299,6 +299,8 @@
 .It
 Telecom Device SuperSocket RE450T
 .It
+Toshiba LANCT00A PC Card
+.It
 VIA VT86C926
 .It
 Winbond W89C940
@@ -307,6 +309,15 @@
 .El
 .Pp
 C-Bus, ISA, PCI and PC Card devices are supported.
+.Pp
+The
+.Nm
+driver does not support the following Ethernet NICs:
+.Pp
+.Bl -bullet -compact
+.It
+Mitsubishi LAN Adapter B8895
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ed%d: failed to clear shared memory at %x - check configuration."
@@ -390,6 +401,10 @@
 In addition, you should also specify
 .Cd "iosiz 16384"
 to take advantage of the extra 8K of shared memory that 16bit mode provides.
+.Pp
+The Mitsubishi B8895 PC Card uses a DP83902, but its ASIC part is
+undocumented.
+Neither the NE2000 nor the WD83x0 drivers work with this card.
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,

==== //depot/projects/vimage/src/share/man/man4/lagg.4#2 (text+ko) ====

@@ -14,9 +14,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.5 2008/01/08 15:36:06 gabor Exp $
+.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.8 2009/03/29 21:08:48 brueffer Exp $
 .\"
-.Dd April 17, 2007
+.Dd March 29, 2009
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -142,10 +142,14 @@
 device will be used:
 .Bd -literal -offset indent
 # ifconfig em0 up
-# ifconfig ath0 nwid my_net up
-# ifconfig lagg0 laggproto failover laggport em0 laggport ath0 \e
+# ifconfig ath0 ether 00:11:22:33:44:55
+# ifconfig create wlan0 wlandev ath0 ssid my_net up
+# ifconfig lagg0 laggproto failover laggport em0 laggport wlan0 \e
 	192.168.1.1 netmask 255.255.255.0
 .Ed
+.Pp
+(Note the mac address of the wireless device is forced to match the wired
+device as a workaround.)
 .Sh SEE ALSO
 .Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
@@ -172,6 +176,3 @@
 and port priorities.
 The current implementation always performs active-mode LACP and uses 0x8000 as
 system and port priorities.
-.Pp
-WPA security does not currently work correctly with a wireless interface added
-to the lagg port.

==== //depot/projects/vimage/src/share/man/man4/lo.4#2 (text+ko) ====

@@ -1,5 +1,7 @@
 .\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
+.\"	The Regents of the University of California.
+.\" Copyright (c) 2009 Robert N. M. Watson
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -9,10 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -30,9 +28,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man4/lo.4,v 1.9 2001/07/10 15:30:38 ru Exp $
+.\" $FreeBSD: src/share/man/man4/lo.4,v 1.10 2009/03/15 20:17:44 rwatson Exp $
 .\"
-.Dd June 5, 1993
+.Dd March 15, 2009
 .Dt LO 4
 .Os
 .Sh NAME
@@ -58,6 +56,20 @@
 .Em never
 be configured first unless no hardware
 interfaces exist.
+.Pp
+If the transmit checksum offload capability flag is enabled on a loopback
+interface, checksums will not be generated by IP, UDP, or TCP for packets
+sent on the interface.
+.Pp
+If the receive checksum offload capability flag is enabled on a loopback
+interface, checksums will not be validated by IP, UDP, or TCP for packets
+received on the interface.
+.Pp
+By default, both receive and transmit checksum flags will be enabled, in
+order to avoid the overhead of checksumming for local communication where
+data corruption is unlikely.
+If transmit checksum generation is disabled, then validation should also be
+disabled in order to avoid packets being dropped due to invalid checksums.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It lo%d: can't handle af%d.
@@ -74,8 +86,5 @@
 .Nm
 device appeared in
 .Bx 4.2 .
-.Sh BUGS
-Previous versions of the system enabled the loopback interface
-automatically, using a nonstandard Internet address (127.1).
-Use of that address is now discouraged; a reserved host address
-for the local network should be used instead.
+The current checksum generation and validation avoidance policy appeared in
+.Fx 8.0 .

==== //depot/projects/vimage/src/share/man/man4/malo.4#2 (text+ko) ====

@@ -29,9 +29,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/malo.4,v 1.6 2008/07/08 04:15:07 weongyo Exp $
+.\" $FreeBSD: src/share/man/man4/malo.4,v 1.8 2009/03/26 06:12:04 weongyo Exp $
 .\"/
-.Dd April 13, 2008
+.Dd March 26, 2009
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -121,4 +121,4 @@
 The
 .Nm
 device driver first appeared in
-.Fx 8.0 .
+.Fx 7.1 .

==== //depot/projects/vimage/src/share/man/man4/man4.i386/fe.4#2 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" Contributed by M. Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>.
 .\" for fe driver.
 .\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.39 2007/02/09 21:05:47 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.40 2009/03/25 22:14:46 imp Exp $
 .Dd July 16, 2005
 .Dt FE 4 i386
 .Os
@@ -149,7 +149,7 @@
 .It
 CONTEC C-NET(98)P2, C-NET (9N)E (110-pin), C-NET(9N)C (ExtCard)
 .It
-CONTEC C-NET(PC)C PCMCIA Ethernet
+CONTEC C-NET(PC)C PC Card Ethernet
 .It
 Eagle Tech NE200T
 .It
@@ -159,11 +159,11 @@
 .It
 Fujitsu MB86960A, MB86965A
 .It
-Fujitsu MBH10303, MBH10302 Ethernet PCMCIA
+Fujitsu MBH10303, MBH10302 PC Card Ethernet
 .It
 Fujitsu Towa LA501 Ethernet
 .It
-HITACHI HT-4840-11
+HITACHI HT-4840-11 PC Card Ethernet
 .It
 NextCom J Link NC5310
 .It
@@ -173,7 +173,7 @@
 .It
 TDK LAC-98012, LAC-98013, LAC-98025, LAC-9N011 (110-pin)
 .It
-TDK LAK-CD021, LAK-CD021A, LAK-CD021BX
+TDK LAK-CD011, LAK-CD021, LAK-CD021A, LAK-CD021BX
 .It
 Ungermann-Bass Access/PC N98C+(PC85152, PC85142), Access/NOTE
 N98(PC86132) (110-pin)

==== //depot/projects/vimage/src/share/man/man4/pccbb.4#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.8 2005/11/18 10:52:22 ru Exp $
+.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.9 2009/03/18 20:03:33 imp Exp $
 .\"
 .Dd July 21, 2004
 .Dt PCCBB 4
@@ -34,6 +34,7 @@
 .Cd device cbb
 .Cd device pccard
 .Cd device cardbus
+.Cd device exca
 .Sh DESCRIPTION
 The
 .Nm
@@ -178,4 +179,5 @@
 .El
 .Sh SEE ALSO
 .Xr cardbus 4 ,
-.Xr pccard 4
+.Xr pccard 4 ,
+.Xr exca 4

==== //depot/projects/vimage/src/share/man/man4/usb.4#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/usb.4,v 1.36 2007/07/24 14:51:21 imp Exp $
+.\" $FreeBSD: src/share/man/man4/usb.4,v 1.37 2009/03/19 20:33:26 thompsa Exp $
 .\"
 .Dd November 22, 2006
 .Dt USB 4
@@ -422,7 +422,6 @@
 .Xr ums 4 ,
 .Xr uplcom 4 ,
 .Xr urio 4 ,
-.Xr uscanner 4 ,
 .Xr uvscom 4 ,
 .Xr usbdevs 8
 .Sh HISTORY

==== //depot/projects/vimage/src/share/man/man4/wlan.4#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/man4/wlan.4,v 1.17 2008/05/03 07:06:48 brooks Exp $
+.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.20 2009/03/26 06:12:04 weongyo Exp $
 .\"
-.Dd April 12, 2008
+.Dd March 26, 2009
 .Dt WLAN 4
 .Os
 .Sh NAME
@@ -164,11 +164,10 @@
 .Sh SEE ALSO
 .Xr an 4 ,
 .Xr ath 4 ,
-.Xr bwi 4 ,
 .Xr ipw 4 ,
 .Xr iwi 4 ,
 .Xr iwn 4 ,
-.Xr mwl 4 ,
+.Xr malo 4 ,
 .Xr netintro 4 ,
 .Xr ral 4 ,
 .Xr rum 4 ,

==== //depot/projects/vimage/src/share/man/man5/devfs.rules.5#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.5 2006/09/18 15:24:19 ru Exp $
+.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.6 2009/03/19 20:33:26 thompsa Exp $
 .\"
 .Dd January 30, 2006
 .Dt DEVFS.RULES 5
@@ -101,12 +101,12 @@
 and the number 10.
 .Pp
 To make all the
-.Xr uscanner 4
+.Xr ulpt 4
 devices accessible to their owner and the
 .Dq Li usb
 group, a similar rule may be used:
 .Pp
-.Dl "add path 'uscanner*' mode 0660 group usb"
+.Dl "add path 'ulpt*' mode 0660 group usb"
 .Sh SEE ALSO
 .Xr glob 3 ,
 .Xr devfs 5 ,

==== //depot/projects/vimage/src/share/man/man8/nanobsd.8#2 (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/man8/nanobsd.8,v 1.4 2007/05/21 15:29:42 ru Exp $
+.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.5 2009/03/16 15:54:21 sam Exp $
 .\"
-.Dd August 28, 2006
+.Dd March 16, 2009
 .Dt NANOBSD 8
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@

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

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 09:18:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B5A31065678; Wed,  1 Apr 2009 09:18:43 +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 E23A0106564A
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 09:18:42 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B67178FC08
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 09:18:42 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n319IgRw004489
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 09:18:42 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n319IgJG004487
	for perforce@freebsd.org; Wed, 1 Apr 2009 09:18:42 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 09:18:42 GMT
Message-Id: <200904010918.n319IgJG004487@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160090 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, 01 Apr 2009 09:18:44 -0000

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

Change 160090 by zec@zec_amdx2 on 2009/04/01 09:18:10

	Unbreak VLINT build.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#18 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#18 (text+ko) ====

@@ -1710,6 +1710,7 @@
 static void
 X_rsvp_input(struct mbuf *m, int off __unused)
 {
+	INIT_VNET_INET(curvnet);
 
 	if (!V_rsvp_on)
 		m_freem(m);

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 09:39:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF6711065677; Wed,  1 Apr 2009 09:39:04 +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 8F258106564A
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 09:39:04 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 645D88FC1C
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 09:39:04 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n319d49K006417
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 09:39:04 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n319d4Gq006415
	for perforce@freebsd.org; Wed, 1 Apr 2009 09:39:04 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 09:39:04 GMT
Message-Id: <200904010939.n319d4Gq006415@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160091 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, 01 Apr 2009 09:39:05 -0000

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

Change 160091 by zec@zec_amdx2 on 2009/04/01 09:38:24

	Use correct / portable format for printf()ing size_t args.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#9 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#9 (text+ko) ====

@@ -148,7 +148,7 @@
 		printf("/%s", vml->vml_iname);
 	printf(": ");
 	if (vmi->vmi_struct_size)
-		printf("malloc(%d); ", vmi->vmi_struct_size);
+		printf("malloc(%zu); ", vmi->vmi_struct_size);
 	if (vmi->vmi_iattach != NULL)
 		printf("iattach()");
 	printf("\n");

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 10:16:53 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 060B01065674; Wed,  1 Apr 2009 10:16:52 +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 B593B106566B
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 10:16:51 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A34268FC0A
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 10:16:51 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n31AGp78011105
	for <perforce@FreeBSD.org>; Wed, 1 Apr 2009 10:16:51 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n31AGpqi011103
	for perforce@freebsd.org; Wed, 1 Apr 2009 10:16:51 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 1 Apr 2009 10:16:51 GMT
Message-Id: <200904011016.n31AGpqi011103@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160093 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, 01 Apr 2009 10:16:53 -0000

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

Change 160093 by rene@rene_self on 2009/04/01 10:16:07

	Remove references of fla(4) and M-Systems DiskOnChip from the solid state article.

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#2 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#2 (text+ko) ====

@@ -109,22 +109,14 @@
       temperature of the environment.</para>
 
     <para>Specifically, we will be discussing ATA compatible compact-flash
-      units and the M-Systems &diskonchip; flash memory unit.  ATA compatible
+      units.  ATA compatible
       compact-flash cards are quite popular as storage media for digital
       cameras.  Of particular interest is the fact that they pin out directly
       to the IDE bus and are compatible with the ATA command set.  Therefore,
       with a very simple and low-cost adaptor, these devices can be attached
       directly to an IDE bus in a computer.  Once implemented in this manner,
       operating systems such as FreeBSD see the device as a normal hard disk
-      (albeit small).  The M-Systems &diskonchip; product is based on the same
-      underlying flash memory technology as ATA compatible compact-flash
-      cards, but resides in a DIP form factor and is not ATA compatible.  To
-      use such a device, not only must you install it on a motherboard that
-      has a &diskonchip; socket, you must also build the `fla` driver into any
-      FreeBSD kernel you wish to use it with.  Further, there is critical,
-      manufacturer-specific data residing in the boot sector of this device,
-      so you must take care not to install the FreeBSD (or any other) boot
-      loader when using this.</para>
+      (albeit small).</para>
 
     <para>Other solid state disk solutions do exist, but their expense,
       obscurity, and relative unease of use places them beyond the scope of
@@ -153,11 +145,6 @@
     <programlisting>options         MFS             # Memory Filesystem
 options         MD_ROOT         # md device usable as a potential root device
 pseudo-device   md              # memory disk</programlisting>
-
-    <para>Second, if you will be using the M-Systems &diskonchip; product, you
-      must also include this line:</para>
-
-    <programlisting>device          fla0    at isa?</programlisting>
   </sect1>
 
   <sect1 id="ro-fs">
@@ -250,8 +237,8 @@
     <title>Building a File System From Scratch</title>
 
     <para>Because ATA compatible compact-flash cards are seen by FreeBSD as
-      normal IDE hard drives, as is a M-Systems &diskonchip; product (when you
-      are running a kernel with the fla driver built in) you could
+      normal IDE hard drives,
+      you could
       theoretically install FreeBSD from the network using the kern and
       mfsroot floppies or from a CD.  Other than the fact that you should not
       write a boot-loader of any kind to the M-Systems device, no special
@@ -274,11 +261,7 @@
       installation is not being performed, operations such as partitioning,
       labeling, file-system creation, etc. need to be performed by hand.  In
       addition to the kern and mfsroot floppy disks, you will also need to use
-      the fixit floppy.  If you are using a M-Systems &diskonchip;, the kernel
-      on your kern floppy must have the <literal>fla</literal> option detailed
-      in <xref linkend="kernel"> compiled into it.  Please see
-      <xref linkend="kern.flp"> for instructions on creating a new kernel for
-      <filename>kern.flp</filename>.</para>
+      the fixit floppy.</para>
 
     <procedure>
       <step>
@@ -294,9 +277,8 @@
 	  type of the partition, make sure the value is set to
 	  <literal>165</literal>.  Now write this partition table to the disk
 	  by pressing the <keycap>w</keycap> key (this is a hidden option on
-	  this screen).  When presented with a menu to choose a boot manager,
-	  take care to select <literal>None</literal> if you are using an
-	  M-Systems &diskonchip;.  If you are using an ATA compatible compact
+	  this screen).
+	  If you are using an ATA compatible compact
 	  flash card, you should choose the FreeBSD Boot Manager.  Now press
 	  the <keycap>q</keycap> key to quit the partition menu.  You will be
 	  shown the boot manager menu once more - repeat the choice you made
@@ -311,12 +293,10 @@
 	  entering the fixit environment, enter the following commands:</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
+	  <tgroup cols="1">
 	    <thead>
 	      <row>
 		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
@@ -324,21 +304,15 @@
 		<entry><para><screen>&prompt.root; <userinput>mknod /dev/ad0a c 116 0</userinput>
 &prompt.root; <userinput>mknod /dev/ad0c c 116 2</userinput>		      
 &prompt.root; <userinput>disklabel -e /dev/ad0c</userinput></screen></para></entry>
-
-		<entry><para><screen>&prompt.root; <userinput>mknod /dev/fla0a c 102 0</userinput>
-&prompt.root; <userinput>mknod /dev/fla0c c 102 2</userinput>
-&prompt.root; <userinput>disklabel -e /dev/fla0c</userinput></screen></para></entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
 	</informaltable>
 
 	<para>At this point you will have entered the vi editor under the
-	  auspices of the disklabel command.  If you are using &diskonchip;,
-	  the first step will be to change the type value near the beginning
-	  of the file from <literal>ESDI</literal> to
-	  <literal>DOC2K</literal>.  Next, regardless of whether you are using
-	  &diskonchip; or ATA compatible compact flash media, you need to add
+	  auspices of the disklabel command.
+	  Next,
+	  you need to add
 	  an <literal>a:</literal> line at the end of the file.  This
 	  <literal>a:</literal> line should look like:</para>
 
@@ -352,21 +326,16 @@
 	  exit.</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
+	  <tgroup cols="1">
 	    <thead>
 	      <row>
 		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
 	      <row>
 		<entry><para><screen>&prompt.root; <userinput>disklabel -B -r /dev/ad0c</userinput>
 &prompt.root; <userinput>newfs /dev/ad0a</userinput></screen></para></entry>
-
-		<entry><para><screen>&prompt.root; <userinput>disklabel -B -r /dev/fla0c</userinput>
-&prompt.root; <userinput>newfs /dev/fla0a</userinput></screen></para></entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -379,19 +348,15 @@
 	<para>Mount the newly prepared flash media:</para>
 
 	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
+	  <tgroup cols="1">
 	    <thead>
 	      <row>
 		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
 	      <row>
 		<entry><para><screen>&prompt.root; <userinput>mount /dev/ad0a /flash</userinput></screen></para></entry>
-
-		<entry><para><screen>&prompt.root; <userinput>mount /dev/fla0a /flash</userinput></screen></para></entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -438,53 +403,6 @@
     </procedure>
   </sect1>
 
-  <sect1 id="kern.flp">
-    <title>Building a <filename>kern.flp</filename> Installation Floppy with
-      the fla Driver</title>
-
-    <note>
-      <para>This section of the article is relevant only to those using
-	M-Systems &diskonchip; flash media.</para>
-    </note>
-
-    <para>It is possible that your <filename>kern.flp</filename> boot floppy
-      does not have a kernel with the <devicename>fla</devicename> driver
-      compiled into it necessary for the system to recognize the &diskonchip;.
-      If you have booted off of the installation floppies and are told that no
-      disks are present, then you are probably lacking the
-      <devicename>fla</devicename> driver in your kernel.</para>
-
-    <para>After you have built a kernel with <devicename>fla</devicename>
-      support that is smaller than 1.4 megabytes, you can create a custom
-      <filename>kern.flp</filename> floppy image with it by following these
-      instructions:</para>
-
-    <procedure>
-      <step>
-	<para>Obtain an existing kern.flp image file</para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>vnconfig vn0c kern.flp</userinput></screen></para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>mount /dev/vn0c /mnt</userinput></screen></para>
-      </step>
-      
-      <step>
-	<para>Place your kernel file into <filename>/mnt</filename>, replacing
-	  the existing one</para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>vnconfig -d vn0c</userinput></screen></para>
-      </step>
-    </procedure>
-
-    <para>Your <filename>kern.flp</filename> file now has your new kernel on it.</para>
-  </sect1>
-
   <sect1 id="strategies">
     <title>System Strategies for Small and Read Only Environments</title>
 

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 10:43:19 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4729D1065674; Wed,  1 Apr 2009 10:43:19 +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 0589C106566B
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 10:43:19 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E8C3A8FC22
	for <perforce@freebsd.org>; Wed,  1 Apr 2009 10:43:18 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n31AhICj013495
	for <perforce@freebsd.org>; Wed, 1 Apr 2009 10:43:18 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n31AhIbt013493
	for perforce@freebsd.org; Wed, 1 Apr 2009 10:43:18 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 1 Apr 2009 10:43:18 GMT
Message-Id: <200904011043.n31AhIbt013493@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160096 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, 01 Apr 2009 10:43:20 -0000

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

Change 160096 by zec@zec_tpx32 on 2009/04/01 10:42:33

	Let makemeat2.pl produce diff vc2 against vc, not vice versa.

Affected files ...

.. //depot/projects/vimage-commit2/makemeat2.pl#2 edit

Differences ...

==== //depot/projects/vimage-commit2/makemeat2.pl#2 (text+ko) ====

@@ -2,8 +2,8 @@
 
 use POSIX (strftime);
 
-$src_base = '//depot/projects/vimage-commit2/src/sys';
-$dst_base = '//depot/projects/vimage-commit/src/sys';
+$dst_base = '//depot/projects/vimage-commit2/src/sys';
+$src_base = '//depot/projects/vimage-commit/src/sys';
 $dst_label = '';
 
 $cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head";

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 10:47:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43F6B1065686; Wed,  1 Apr 2009 10:47:24 +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 5E4A8106567A
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 10:47:23 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 483AD8FC27
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 10:47:23 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n31AlN3I013822
	for <perforce@FreeBSD.org>; Wed, 1 Apr 2009 10:47:23 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n31AlNSS013820
	for perforce@freebsd.org; Wed, 1 Apr 2009 10:47:23 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 1 Apr 2009 10:47:23 GMT
Message-Id: <200904011047.n31AlNSS013820@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160097 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, 01 Apr 2009 10:47:33 -0000

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

Change 160097 by rene@rene_self on 2009/04/01 10:47:04

	solid-state article:
	* transform 1x1 tables into regular paragraphs after fla(4) removal
	* Small whitespace cleanups

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#3 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#3 (text+ko) ====

@@ -55,6 +55,7 @@
 
     <copyright>
       <year>2001</year>
+      <year>2009</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -237,8 +238,7 @@
     <title>Building a File System From Scratch</title>
 
     <para>Because ATA compatible compact-flash cards are seen by FreeBSD as
-      normal IDE hard drives,
-      you could
+      normal IDE hard drives, you could
       theoretically install FreeBSD from the network using the kern and
       mfsroot floppies or from a CD.  Other than the fact that you should not
       write a boot-loader of any kind to the M-Systems device, no special
@@ -277,8 +277,7 @@
 	  type of the partition, make sure the value is set to
 	  <literal>165</literal>.  Now write this partition table to the disk
 	  by pressing the <keycap>w</keycap> key (this is a hidden option on
-	  this screen).
-	  If you are using an ATA compatible compact
+	  this screen).  If you are using an ATA compatible compact
 	  flash card, you should choose the FreeBSD Boot Manager.  Now press
 	  the <keycap>q</keycap> key to quit the partition menu.  You will be
 	  shown the boot manager menu once more - repeat the choice you made
@@ -292,27 +291,12 @@
 	  installation menu choose the <literal>fixit</literal> option.  After
 	  entering the fixit environment, enter the following commands:</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="1">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>mknod /dev/ad0a c 116 0</userinput>
+	<para><screen>&prompt.root; <userinput>mknod /dev/ad0a c 116 0</userinput>
 &prompt.root; <userinput>mknod /dev/ad0c c 116 2</userinput>		      
-&prompt.root; <userinput>disklabel -e /dev/ad0c</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
+&prompt.root; <userinput>disklabel -e /dev/ad0c</userinput></screen></para>
 
 	<para>At this point you will have entered the vi editor under the
-	  auspices of the disklabel command.
-	  Next,
-	  you need to add
+	  auspices of the disklabel command.  Next, you need to add
 	  an <literal>a:</literal> line at the end of the file.  This
 	  <literal>a:</literal> line should look like:</para>
 
@@ -325,21 +309,8 @@
 	  sure that fstype is <literal>4.2BSD</literal>.  Save the file and
 	  exit.</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="1">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>disklabel -B -r /dev/ad0c</userinput>
-&prompt.root; <userinput>newfs /dev/ad0a</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
+	<para><screen>&prompt.root; <userinput>disklabel -B -r /dev/ad0c</userinput>
+&prompt.root; <userinput>newfs /dev/ad0a</userinput></screen></para>
       </step>
 
       <step>
@@ -347,20 +318,7 @@
 
 	<para>Mount the newly prepared flash media:</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="1">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>mount /dev/ad0a /flash</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
+	<para><screen>&prompt.root; <userinput>mount /dev/ad0a /flash</userinput></screen></para>
 	
 	<para>Bring this machine up on the network so we may transfer our tar
 	  file and explode it onto our flash media filesystem.  One example of

From owner-p4-projects@FreeBSD.ORG  Wed Apr  1 16:52:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4247A1065673; Wed,  1 Apr 2009 16:52:50 +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 F321B1065672
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 16:52:49 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E1C398FC08
	for <perforce@FreeBSD.org>; Wed,  1 Apr 2009 16:52:49 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n31GqnpG070380
	for <perforce@FreeBSD.org>; Wed, 1 Apr 2009 16:52:49 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n31Gqnrd070378
	for perforce@freebsd.org; Wed, 1 Apr 2009 16:52:49 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 1 Apr 2009 16:52:49 GMT
Message-Id: <200904011652.n31Gqnrd070378@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160114 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, 01 Apr 2009 16:52:51 -0000

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

Change 160114 by rene@rene_self on 2009/04/01 16:52:14

	solid-state article:
	* merge 2 sentences refering to ATA cards [1]
	* remove last instance of M-Systems
	Submitted by:	manolis [1]

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#4 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#4 (text+ko) ====

@@ -110,8 +110,8 @@
       temperature of the environment.</para>
 
     <para>Specifically, we will be discussing ATA compatible compact-flash
-      units.  ATA compatible
-      compact-flash cards are quite popular as storage media for digital
+      units, which  
+      are quite popular as storage media for digital
       cameras.  Of particular interest is the fact that they pin out directly
       to the IDE bus and are compatible with the ATA command set.  Therefore,
       with a very simple and low-cost adaptor, these devices can be attached
@@ -240,9 +240,7 @@
     <para>Because ATA compatible compact-flash cards are seen by FreeBSD as
       normal IDE hard drives, you could
       theoretically install FreeBSD from the network using the kern and
-      mfsroot floppies or from a CD.  Other than the fact that you should not
-      write a boot-loader of any kind to the M-Systems device, no special
-      instructions are needed.</para>
+      mfsroot floppies or from a CD.</para>
 
     <para>However, even a small installation of FreeBSD using normal
       installation procedures can produce a system in size of greater than 200

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 07:40:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74C051065679; Thu,  2 Apr 2009 07:40:00 +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 200401065675
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 07:40:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D3C48FC1C
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 07:40:00 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n327dxe0082229
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 07:39:59 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n327dxMI082227
	for perforce@freebsd.org; Thu, 2 Apr 2009 07:39:59 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 2 Apr 2009 07:39:59 GMT
Message-Id: <200904020739.n327dxMI082227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160132 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: Thu, 02 Apr 2009 07:40:02 -0000

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

Change 160132 by rene@rene_self on 2009/04/02 07:39:57

	solid-state article:
	* remove now unused attribution of M-Systems
	* wrap 2 short lines

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#5 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#5 (text+ko) ====

@@ -61,7 +61,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.m-systems;
       &tm-attrib.general;
     </legalnotice>
 
@@ -110,8 +109,7 @@
       temperature of the environment.</para>
 
     <para>Specifically, we will be discussing ATA compatible compact-flash
-      units, which  
-      are quite popular as storage media for digital
+      units, which  are quite popular as storage media for digital
       cameras.  Of particular interest is the fact that they pin out directly
       to the IDE bus and are compatible with the ATA command set.  Therefore,
       with a very simple and low-cost adaptor, these devices can be attached

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 08:41:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 554081065675; Thu,  2 Apr 2009 08:41:09 +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 13A801065673
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:41:09 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F3AAC8FC13
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:41:08 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n328f4ki088181
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 08:41:04 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n328f2Tb088178
	for perforce@freebsd.org; Thu, 2 Apr 2009 08:41:02 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 08:41:02 GMT
Message-Id: <200904020841.n328f2Tb088178@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160134 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: Thu, 02 Apr 2009 08:41:10 -0000

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

Change 160134 by pgj@petymeg on 2009/04/02 08:40:51

	MFen (www):
		1.27 -> 1.28	hu/share/sgml/libcommon.xsl
		1.74 -> 1.76	hu/share/sgml/press.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#8 edit
.. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#2 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#8 (text+ko) ====

@@ -6,7 +6,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
      %SOURCE%	share/sgml/libcommon.xsl
-     %SRCID%	1.27
+     %SRCID%	1.28
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -106,7 +106,7 @@
   </xsl:template>
 
   <xsl:template name="html-news-make-olditems-list">
-    <p>Kor&aacute;bbi bejelent&eacute;sek:
+    <p>A kor&aacute;bbi &eacute;vek h&iacute;rei:
       <a href="&enbase;/news/2008/index.html">2008</a>,
       <a href="&enbase;/news/2007/index.html">2007</a>,
       <a href="&enbase;/news/2006/index.html">2006</a>,
@@ -127,8 +127,7 @@
   </xsl:template>
 
   <xsl:template name="html-press-make-olditems-list">
-    <p>Kor&aacute;bbi sajt&oacute;kiadv&aacute;nyok:
-      <a href="&enbase;/news/2008/press.html">2008</a>,
+    <p>A kor&aacute;bbi &eacute;vek sajt&oacute;kiadv&aacute;nyai:
       <a href="&enbase;/news/2007/press.html">2007</a>,
       <a href="&enbase;/news/2006/press.html">2006</a>,
       <a href="&enbase;/news/2005/press.html">2005</a>,

==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#2 (text+ko) ====

@@ -5,7 +5,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%   share/sgml/press.xml
-     %SRCID%    1.74
+     %SRCID%    1.76
 -->
 
 <press>
@@ -19,7 +19,27 @@
     <name>2009</name>
 
     <month>
+      <name>3</name>
+
+      <story>
+	<name>A Tomahawk Desktop Linuxr&oacute;l BSD rendszerre
+	  v&aacute;lt</name>
+	<url>http://www.tomahawkcomputers.com/fund-raising/phase-one.html</url>
+	<site-name>Tomahawk Computers</site-name>
+	<site-url>http://www.tomahawkcomputers.com</site-url>
+	<date>2009. m&aacute;rcius 10.</date>
+	<author>Sagara Wijetunga</author>
+	<p>A Tomahawk Desktop oper&aacute;ci&oacute;s rendszer &uacute;j
+	  v&aacute;ltozat&aacute;nak
+	  elk&eacute;sz&iacute;t&eacute;s&eacute;hez a Tomahawk
+	  Computers Pte Ltd.  Linuxr&oacute;l a &os; rendszer&eacute;re
+	  v&aacute;ltott.</p>
+      </story>
+    </month>
+
+    <month>
       <name>1</name>
+
       <story>
 	<name>A Coyote Point a &os; seg&iacute;ts&eacute;g&eacute;vel
 	  gyors&iacute;t be</name>
@@ -46,4 +66,172 @@
       </story>
     </month>
   </year>
+
+  <year>
+    <name>2008</name>
+
+    <month>
+      <name>10</name>
+
+      <story>
+	<name>C&eacute;lpontban a PC-BSD 7</name>
+	<url>http://www.osnews.com/story/20351/Review_PC-BSD_7</url>
+	<site-name>OS News</site-name>
+	<site-url>http://www.osnews.com/</site-url>
+	<date>2008. okt&oacute;ber 2.</date>
+	<author>Amjith Ramanujam</author>
+	<p>A PC-BSD 7 bemutat&aacute;sa.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>8</name>
+
+      <story>
+	<name>Olcs&oacute; h&aacute;l&oacute;zati
+	  t&aacute;rol&oacute;k</name>
+	<url>http://www.washingtonpost.com/wp-dyn/content/article/2008/08/26/AR2008082600237.html</url>
+	<site-name>Washington Post</site-name>
+	<site-url>http://www.washingtonpost.com/</site-url>
+	<date>2008. augusztus 27.</date>
+	<author>Tom Mainelli</author>
+	<p>Hogyan v&aacute;ltoztassuk &aacute;t ki&ouml;regedett
+	  sz&aacute;m&iacute;t&oacute;g&eacute;p&uuml;nket
+	  h&aacute;l&oacute;zati t&aacute;rol&oacute;v&aacute; a &os;
+	  alap&uacute; FreeNAS seg&iacute;ts&eacute;g&eacute;vel.</p>
+      </story>
+
+      <story>
+	<name>A k&uuml;l&ouml;nb&ouml;z&#245; ny&iacute;lt
+	  forr&aacute;sk&oacute;d&uacute; rendszerek
+	  eloszl&aacute;sa</name>
+	<url>https://www.osscensus.org/newsletter/Census-News-August-2008.html</url>
+	<site-name>The Open-Source Census</site-name>
+	<site-url>http://www.osscensus.org</site-url>
+	<date>2008 augusztus</date>
+	<author>Stormy Peters</author>
+	<p>A &os; felhaszn&aacute;l&oacute;k becs&uuml;lt
+	  sz&aacute;m&aacute;r&oacute;l k&eacute;sz&uuml;lt friss
+	  kimutat&aacute;s.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>7</name>
+
+      <story>
+	<name>K&ouml;nyvismertet&#245;: Building a Server with &os;&nbsp;7</name>
+	<url>http://www.freesoftwaremagazine.com/articles/book_review_building_server_freebsd_7</url>
+	<site-name>Free Software Magazine</site-name>
+	<site-url>http://www.freesoftwaremagazine.com/</site-url>
+	<date>2008. j&uacute;lius 7.</date>
+	<author>Ken Leyba</author>
+	<p>R&ouml;vid kedvcsin&aacute;l&oacute; Bryan J.  Hong
+	  <q>Building a Server with &os;&nbsp;7</q> c&iacute;m&#251;
+	  k&ouml;nyv&eacute;hez.</p>
+      </story>
+
+      <story>
+	<name>K&ouml;nyvismertet&#245;: The Best of &os; Basics</name>
+	<url>http://www.osnews.com/story/19947/Book_Review:_The_Best_of_FreeBSD_Basics</url>
+	<site-name>OS News</site-name>
+	<site-url>http://www.osnews.com/</site-url>
+	<date>2008. j&uacute;lius 2.</date>
+	<author>Peter Hummers</author>
+	<p>A <q>The Best of &os; Basics</q> c&iacute;m&#251; k&ouml;nyv r&ouml;vid
+	  ismertet&eacute;se.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>6</name>
+
+      <story>
+	<name>A &os; v&aacute;lasza a sebezhet&#245;s&eacute;gek
+	  egyszer&#251; fel&uuml;lvizsg&aacute;lat&aacute;ra: a
+	  portaudit</name>
+	<url>http://blogs.techrepublic.com.com/security/?p=477</url>
+	<site-name>Tech Republic</site-name>
+	<site-url>http://www.techrepublic.com.com/</site-url>
+	<date>2008. j&uacute;nius 24.</date>
+	<author>Chad Perrin</author>
+	<p>Ebb&#245;l a cikkb&#245;l megismerhetj&uuml;k, hogy &os;
+	  rendszer&uuml;nk sebezhet&#245;s&eacute;geihez mik&eacute;nt
+	  tudjuk gyorsan &eacute;s k&ouml;nnyed&eacute;n
+	  jav&iacute;t&aacute;sokat let&ouml;lteni.</p>
+      </story>
+
+      <story>
+	<name>Kernelmodulok &iacute;r&aacute;sa &os;&nbsp;7
+	  rendszerekre</name>
+	<url>http://www.freesoftwaremagazine.com/articles/writing_a_kernel_module_for_freebsd</url>
+	<site-name>Free Software Magazine</site-name>
+	<site-url>http://www.freesoftwaremagazine.com/</site-url>
+	<date>2008. j&uacute;nius 18.</date>
+	<author>Yousef Ourabi</author>
+	<p>Egy r&ouml;vid ismertet&#245; a kernelmodulok
+	  fejleszt&eacute;s&eacute;nek mik&eacute;ntj&eacute;r&#245;l
+	  &os;&nbsp;7 rendszerekre.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>3</name>
+
+      <story>
+	<name>Bemutatkozik a &os;&nbsp;7</name>
+	<url>http://www.freesoftwaremagazine.com/articles/review_of_freebsd_7</url>
+	<site-name>Free Software Magazine</site-name>
+	<site-url>http://www.freesoftwaremagazine.com/</site-url>
+	<date>2008. m&aacute;rcius 5.</date>
+	<author>Yousef Ourabi</author>
+	<p>A &os;&nbsp;7.0 harmadik b&eacute;ta kiad&aacute;s&aacute;nak
+	  ismertet&eacute;se.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>2</name>
+
+      <story>
+	<name>Nagyobb teljes&iacute;tm&eacute;ny, kevesebb
+	  g&eacute;p?</name>
+	<url>http://www.internetnews.com/dev-news/article.php/3731386/Faster+Performance+Fewer+Machines+For+FreeBSD.htm</url>
+	<site-name>InternetNews.com</site-name>
+	<site-url>http://www.internetnews.com/</site-url>
+	<date>2008. febru&aacute;r 29.</date>
+	<author>Sean Michael Kerner</author>
+	<p>A &os;&nbsp;7.0 r&ouml;vid &aacute;ttekint&eacute;se.</p>
+      </story>
+
+      <story>
+	<name>A &os;&nbsp;7.0 &uacute;jdons&aacute;gai</name>
+	<url>http://www.onlamp.com/pub/a/bsd/2008/02/26/whats-new-in-freebsd-70.html</url>
+	<site-name>ONLamp.com</site-name>
+	<site-url>http://www.onlamp.com/</site-url>
+	<date>2008. febru&aacute;r 26.</date>
+	<author>Federico Biancuzzi</author>
+	<p>Megk&eacute;rdezt&uuml;nk n&eacute;h&aacute;ny &os;
+	  fejleszt&#245;t a &os;&nbsp;7.0-RELEASE v&aacute;rhat&oacute;
+	  &uacute;jdons&aacute;gair&oacute;l.</p>
+      </story>
+    </month>
+
+    <month>
+      <name>1</name>
+
+      <story>
+	<name>Megjelent a DesktopBSD&nbsp;1.6!</name>
+	<url>http://www.osnews.com/story/19134/DesktopBSD_1.6_Released</url>
+	<site-name>OSNews</site-name>
+	<site-url>http://www.osnews.com/</site-url>
+	<date>2008. janu&aacute;r 9.</date>
+	<author>Thom Holwerda</author>
+	<p>Megjelent a DesktopBSD&nbsp;1.6 kiad&aacute;sa!  A <a
+	    href="http://www.desktopbsd.net/">DesktopBSD</a> egy
+	  &os; alapokon nyugv&oacute;, asztali g&eacute;pekre
+	  sz&aacute;nt oper&aacute;ci&oacute;s rendszer.</p>
+      </story>
+    </month>
+  </year>
 </press>

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 08:44:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 003941065764; Thu,  2 Apr 2009 08:44:12 +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 9E4C91065751
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:44:12 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 702E38FC21
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:44:12 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n328iCMv088387
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 08:44:12 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n328iCmr088385
	for perforce@freebsd.org; Thu, 2 Apr 2009 08:44:12 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 08:44:12 GMT
Message-Id: <200904020844.n328iCmr088385@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160135 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: Thu, 02 Apr 2009 08:44:15 -0000

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

Change 160135 by pgj@petymeg on 2009/04/02 08:44:09

	- Standardize Hungarian translation of "More" on the front page
	- Fix a link for the errata RSS Feed image

Affected files ...

.. //depot/projects/docproj_hu/www/hu/index.xsl#18 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/index.xsl#18 (text+ko) ====

@@ -98,7 +98,7 @@
 				  haszn&aacute;l.</p>
 
 				<div id="TXTFRONTFEATURELINK"> &#187;
-				  <a href="&base;/about.html" title="B&#245;vebben">B&#245;vebben</a>
+				  <a href="&base;/about.html" title="Tov&aacute;bb">Tov&aacute;bb</a>
 				</div> <!-- TXTFRONTFEATURELINK -->
 			</div> <!-- FRONTFEATURECONTENT -->
 		</div> <!-- FRONTFEATURELEFT -->
@@ -250,7 +250,7 @@
 				  </li>
 				  <li class="last-child">
 					<a
-					  href="&base;/news/rss.xml" title="H&iacute;rek RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="H&iacute;rek RSS Feed" /></a>
+					  href="&base;/news/rss.xml" title="H&iacute;rek RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="H&iacute;rek RSS feedben" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -327,7 +327,7 @@
 				  </li>
 				  <li class="last-child">
 					<a
-					  href="&base;/security/rss.xml" title="Biztons&aacute;gi figyelmeztet&eacute;sek RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Biztons&aacute;gi figyelmeztet&eacute;sek RSS Feed" /></a>
+					  href="&base;/security/rss.xml" title="Biztons&aacute;gi figyelmeztet&eacute;sek RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Biztons&aacute;gi figyelmeztet&eacute;sek RSS feedben" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@@ -346,10 +346,11 @@
 			    <ul class="newseventslist">
 			      <li class="first-child">
 				<a
-				  href="&base;/security/" title="M&eacute;g t&ouml;bb sajt&oacute;hiba mutat&aacute;sa">B&#245;vebben</a>
+				  href="&base;/security/" title="M&eacute;g t&ouml;bb sajt&oacute;hiba mutat&aacute;sa">Tov&aacute;bb</a>
 			      </li>
 			      <li class="last-child">
-				<a href="&base;/security/errata.xml" title="Sajt&oacute;hib&aacute;k RSS feedben"><img class="rssimage" src="&base;/layout/images/ico_rss.png" width="27" height="12" alt="Sajt&oacute;hib&aacute;k RSS feedben"/></a>
+				<a
+				  href="&base;/security/errata.xml" title="Sajt&oacute;hib&aacute;k RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Sajt&oacute;hib&aacute;k RSS feedben"/></a>
 			      </li>
 			    </ul>
 			  </div> <!-- unnamed -->

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 08:46:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E2A9C106567A; Thu,  2 Apr 2009 08:46:14 +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 94EA9106567E
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:46:14 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 670608FC0C
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 08:46:14 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n328kEdm088575
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 08:46:14 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n328kECE088573
	for perforce@freebsd.org; Thu, 2 Apr 2009 08:46:14 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 08:46:14 GMT
Message-Id: <200904020846.n328kECE088573@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160136 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: Thu, 02 Apr 2009 08:46:17 -0000

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

Change 160136 by pgj@petymeg on 2009/04/02 08:45:23

	As a final effort, add an initial Hungarian translation for the
	security advisories page (RSS feed is also supported).

Affected files ...

.. //depot/projects/docproj_hu/www/hu/Makefile#5 edit
.. //depot/projects/docproj_hu/www/hu/security/Makefile#1 add
.. //depot/projects/docproj_hu/www/hu/security/advisories.sgml#1 add
.. //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#1 add
.. //depot/projects/docproj_hu/www/hu/security/errata.rss#1 add
.. //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#1 add
.. //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#1 add
.. //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#1 add
.. //depot/projects/docproj_hu/www/hu/security/security.sgml#1 add
.. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#22 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/Makefile#5 (text+ko) ====

@@ -39,7 +39,7 @@
 SUBDIR+=	platforms
 SUBDIR+=	projects
 SUBDIR+=	search
-#SUBDIR+=	security
+SUBDIR+=	security
 SUBDIR+=	support
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+=	doc

==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#22 (text+ko) ====

@@ -21,9 +21,9 @@
     <li><a href="&base;/advocacy/">K&eacute;pviselet</a></li>
     <li><a href="&enbase;/marketing/">Marketing</a></li>
     <li><a href="&base;/administration.html">Szervezeti fel&eacute;p&iacute;t&eacute;s</a></li>
-    <li><a href="&enbase;/news/newsflash.html">H&iacute;rek</a></li>
-    <li><a href="&enbase;/events/events.html">Esem&eacute;nyek</a></li>
-    <li><a href="&enbase;/news/press.html">Sajt&oacute;</a></li>
+    <li><a href="&base;/news/newsflash.html">H&iacute;rek</a></li>
+    <li><a href="&base;/events/events.html">Esem&eacute;nyek</a></li>
+    <li><a href="&base;/news/press.html">Sajt&oacute;</a></li>
     <li><a href="&enbase;/multimedia/multimedia.html">Multim&eacute;dia anyagok</a></li>
     <li><a href="&base;/art.html">Illusztr&aacute;ci&oacute;k</a></li>
     <li><a href="&base;/logo.html">Log&oacute;</a></li>
@@ -186,10 +186,10 @@
 	<li><a href="&enbase;/commercial/misc.html">Egy&eacute;b</a></li>
       </ul>
     </li>
-    <li><a href="&enbase;/security/index.html">Biztons&aacute;gi tudnival&oacute;k</a></li>
+    <li><a href="&base;/security/index.html">Biztons&aacute;gi tudnival&oacute;k</a></li>
     <li>
       <ul>
-	<li><a href="&enbase;/security/advisories.html">Biztons&aacute;gi figyelmeztet&eacute;sek</a></li>
+	<li><a href="&base;/security/advisories.html">Biztons&aacute;gi figyelmeztet&eacute;sek</a></li>
       </ul>
     </li>
     <li><a href="&base;/support/bugreports.html">Hibajelent&eacute;sek</a>

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 09:02:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8DAB61065672; Thu,  2 Apr 2009 09:02:31 +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 4DAE91065670
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:02:31 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AA1F8FC16
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:02:31 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3292Uo8099568
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 09:02:30 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3292UZL099566
	for perforce@freebsd.org; Thu, 2 Apr 2009 09:02:30 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 09:02:30 GMT
Message-Id: <200904020902.n3292UZL099566@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160137 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: Thu, 02 Apr 2009 09:02:32 -0000

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

Change 160137 by pgj@petymeg on 2009/04/02 09:02:13

	Tag files

Affected files ...

.. //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#2 edit
.. //depot/projects/docproj_hu/www/hu/security/errata.rss#2 edit
.. //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#2 edit
.. //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#2 edit
.. //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#2 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/security/errata-rss.xsl#2 (text+ko) ====

@@ -4,7 +4,13 @@
 <!ENTITY base ".">
 <!ENTITY title "">
 ]>
-<!-- $FreeBSD: www/en/security/errata-rss.xsl,v 1.1 2008/06/20 20:03:28 danger Exp $ -->
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     %SOURCE%	en/security/errata-rss.xsl
+     %SRCID%	1.1
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"

==== //depot/projects/docproj_hu/www/hu/security/errata.rss#2 (text+ko) ====

@@ -4,7 +4,13 @@
 <!ENTITY base ".">
 <!ENTITY title "">
 ]>
-<!-- $FreeBSD: www/en/security/errata.rss,v 1.1 2008/06/20 20:03:28 danger Exp $ -->
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     %SOURCE%	en/security/errata.rss
+     %SRCID%	1.1
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"

==== //depot/projects/docproj_hu/www/hu/security/mkindex.xsl#2 (text+ko) ====

@@ -5,12 +5,18 @@
 <!ENTITY title "">
 ]>
 
-<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.6 2008/03/01 01:55:27 simon Exp $ -->
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     %SOURCE%	en/security/mkindex.xsl
+     %SRCID%	1.6
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:output type="xml" encoding="iso-8859-1"
+  <xsl:output type="xml" encoding="iso-8859-2"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">

==== //depot/projects/docproj_hu/www/hu/security/security-rdf.xsl#2 (text+ko) ====

@@ -4,7 +4,13 @@
 <!ENTITY base ".">
 <!ENTITY title "">
 ]>
-<!-- $FreeBSD: www/en/security/security-rdf.xsl,v 1.2 2006/08/19 21:20:52 hrs Exp $ -->
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     %SOURCE%	en/security/security-rdf.xsl
+     %SRCID%	1.2
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>

==== //depot/projects/docproj_hu/www/hu/security/security-rss.xsl#2 (text+ko) ====

@@ -4,7 +4,13 @@
 <!ENTITY base ".">
 <!ENTITY title "">
 ]>
-<!-- $FreeBSD: www/en/security/security-rss.xsl,v 1.1 2008/01/10 04:23:39 murray Exp $ -->
+<!-- $FreeBSD$ -->
+
+<!-- The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     %SOURCE%	en/security/security-rss.xsl
+     %SRCID%	1.1
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 09:05:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85D061065674; Thu,  2 Apr 2009 09:05:34 +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 451541065672
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:05:34 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 32E068FC1B
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:05:34 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3295YdO001103
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 09:05:34 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3295Y6X001101
	for perforce@freebsd.org; Thu, 2 Apr 2009 09:05:34 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 09:05:34 GMT
Message-Id: <200904020905.n3295Y6X001101@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160138 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: Thu, 02 Apr 2009 09:05:35 -0000

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

Change 160138 by pgj@petymeg on 2009/04/02 09:05:20

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#8 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#3 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#8 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.110 2009/01/05 04:08:45 hrs Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.112 2009/04/01 19:56:07 chinsan Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being
@@ -81,8 +81,8 @@
 <!ENTITY % not.published 	"IGNORE">
 
 <!-- Number of ports in the ports tree -->
-<!ENTITY os.numports "19,000">
-<!ENTITY ports.size "445&nbsp;MB">
+<!ENTITY os.numports "20,000">
+<!ENTITY ports.size "417&nbsp;MB">
 
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">

==== //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.2 2009/03/26 06:43:09 maxim Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.4 2009/04/01 19:03:06 blackend Exp $">
 <!ENTITY local.rel "7.2">
 <!ENTITY local.rel.tag "7_2">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -106,7 +106,7 @@
     <tr>
       <td><tt>BETA1</tt> builds</td>
       <td>30&nbsp;March&nbsp;2009</td>
-      <td>--</td>
+      <td>31&nbsp;March&nbsp;2009</td>
       <td>Begin BETA1 builds.</td>
     </tr>
 

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 09:17:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4983710656FA; Thu,  2 Apr 2009 09:17:47 +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 DDE5F10656F1
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:17:46 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CAC308FC13
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:17:46 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n329Hk9o002451
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 09:17:46 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n329Hk37002449
	for perforce@freebsd.org; Thu, 2 Apr 2009 09:17:46 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 2 Apr 2009 09:17:46 GMT
Message-Id: <200904020917.n329Hk37002449@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160139 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: Thu, 02 Apr 2009 09:17:48 -0000

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

Change 160139 by rene@rene_self on 2009/04/02 09:17:31

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#18 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#30 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#9 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#6 (text+ko) ====

@@ -27,7 +27,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.13 2004/11/29 21:43:34 ceri Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.14 2009/04/02 07:59:32 rene Exp $
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -51,7 +51,7 @@
       </author>
     </authorgroup>
     
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.13 2004/11/29 21:43:34 ceri Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v 1.14 2009/04/02 07:59:32 rene Exp $</pubdate>
 
     <copyright>
       <year>2001</year>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#18 (text+ko) ====

@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1110 2009/03/10 06:01:59 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1111 2009/03/30 22:10:18 manolis Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -4960,7 +4960,7 @@
 
 	<answer>
 	  <para>See the <ulink
-	      url="&url.books.handbook;/add-disks.html">Adding Disks</ulink>
+	      url="&url.books.handbook;/disks-adding.html">Adding Disks</ulink>
 	    section in the &os; Handbook.</para>
 	</answer>
       </qandaentry>

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#30 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.11 2009/02/27 17:22:46 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.12 2009/03/30 18:59:03 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
      %SRCID%   1.422

==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#9 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.110 2009/01/05 04:08:45 hrs Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.112 2009/04/01 19:56:07 chinsan Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being
@@ -81,8 +81,8 @@
 <!ENTITY % not.published 	"IGNORE">
 
 <!-- Number of ports in the ports tree -->
-<!ENTITY os.numports "19,000">
-<!ENTITY ports.size "445&nbsp;MB">
+<!ENTITY os.numports "20,000">
+<!ENTITY ports.size "417&nbsp;MB">
 
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">

==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.2 2009/03/26 06:43:09 maxim Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.2R/schedule.sgml,v 1.4 2009/04/01 19:03:06 blackend Exp $">
 <!ENTITY local.rel "7.2">
 <!ENTITY local.rel.tag "7_2">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -106,7 +106,7 @@
     <tr>
       <td><tt>BETA1</tt> builds</td>
       <td>30&nbsp;March&nbsp;2009</td>
-      <td>--</td>
+      <td>31&nbsp;March&nbsp;2009</td>
       <td>Begin BETA1 builds.</td>
     </tr>
 

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 09:29:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D71E1065670; Thu,  2 Apr 2009 09:29:59 +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 5B5B91065672
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:29:59 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 490EB8FC1C
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 09:29:59 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n329Txsw006264
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 09:29:59 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n329Tx0q006262
	for perforce@freebsd.org; Thu, 2 Apr 2009 09:29:59 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 2 Apr 2009 09:29:59 GMT
Message-Id: <200904020929.n329Tx0q006262@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160140 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: Thu, 02 Apr 2009 09:30:00 -0000

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

Change 160140 by pgj@petymeg on 2009/04/02 09:29:23

	MFen (www):
		1.16 -> 1.17	hu/community/mailinglists.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#13 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#13 (text+ko) ====

@@ -9,7 +9,7 @@
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
      %SOURCE%	en/community/mailinglists.sgml
-     %SRCID%	1.16
+     %SRCID%	1.17
 -->
 
 <html>
@@ -94,9 +94,9 @@
 
       <li><strong>Magyar</strong> &mdash; <a
 	  href="mailto:bsd@hu.FreeBSD.org">bsd@hu.FreeBSD.org</a>, <a
-	  href="http://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Adminisztr&aacute;ci&oacute;</a>
+	  href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Adminisztr&aacute;ci&oacute;</a>
 	vagy <a
-	  href="http://lists.hu.FreeBSD.org/bsd/cgi/search.cgi">Keres&eacute;s</a>.
+	  href="http://lists.hu.FreeBSD.org/pipermail/bsd/">Keres&eacute;s</a>.
 	</li>
 
       <li><strong>N&eacute;met</strong> &mdash; <a

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 12:17:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A781A1065696; Thu,  2 Apr 2009 12:17:11 +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 5A9DE10656C9
	for <perforce@freebsd.org>; Thu,  2 Apr 2009 12:17:11 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 463FB8FC20
	for <perforce@freebsd.org>; Thu,  2 Apr 2009 12:17:11 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n32CH92j023110
	for <perforce@freebsd.org>; Thu, 2 Apr 2009 12:17:09 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n32CGmQg023084
	for perforce@freebsd.org; Thu, 2 Apr 2009 12:16:48 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 2 Apr 2009 12:16:48 GMT
Message-Id: <200904021216.n32CGmQg023084@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160144 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: Thu, 02 Apr 2009 12:17:13 -0000

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

Change 160144 by piso@piso_southcross on 2009/04/02 12:16:35

	IFC@160141

Affected files ...

.. //depot/projects/soc2005/libalias/COPYRIGHT#5 integrate
.. //depot/projects/soc2005/libalias/MAINTAINERS#14 integrate
.. //depot/projects/soc2005/libalias/Makefile#20 integrate
.. //depot/projects/soc2005/libalias/Makefile.inc1#22 integrate
.. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#35 integrate
.. //depot/projects/soc2005/libalias/UPDATING#33 integrate
.. //depot/projects/soc2005/libalias/bin/cat/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/bin/chmod/chmod.1#3 integrate
.. //depot/projects/soc2005/libalias/bin/dd/dd.1#2 integrate
.. //depot/projects/soc2005/libalias/bin/kenv/kenv.1#2 integrate
.. //depot/projects/soc2005/libalias/bin/ln/ln.1#4 integrate
.. //depot/projects/soc2005/libalias/bin/pax/file_subs.c#3 integrate
.. //depot/projects/soc2005/libalias/bin/ps/extern.h#3 integrate
.. //depot/projects/soc2005/libalias/bin/ps/keyword.c#3 integrate
.. //depot/projects/soc2005/libalias/bin/ps/print.c#4 integrate
.. //depot/projects/soc2005/libalias/bin/sh/alias.c#3 integrate
.. //depot/projects/soc2005/libalias/bin/sh/miscbltin.c#3 integrate
.. //depot/projects/soc2005/libalias/bin/test/test.1#5 integrate
.. //depot/projects/soc2005/libalias/cddl/Makefile.inc#6 integrate
.. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate
.. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate
.. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/soc2005/libalias/cddl/lib/libzpool/Makefile#6 integrate
.. //depot/projects/soc2005/libalias/cddl/usr.bin/ztest/Makefile#6 integrate
.. //depot/projects/soc2005/libalias/cddl/usr.sbin/zdb/Makefile#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#10 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/COPYRIGHT#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/FAQ#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/FAQ.xml#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/README#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/aclocal.m4#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/check-tool.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.1#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dighost.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.1#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/client.c#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/config.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/controlconf.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/include/named/globals.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/interfacemgr.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwaddr.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdgnba.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwdnoop.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/main.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.5#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.docbook#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.docbook#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/server.c#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/unix/os.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/update.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.8#5 delete
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.docbook#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.html#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/config.h.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/configure.in#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dig.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.host.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.html#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/format-options.pl#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/migration#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/options#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/sort-options.pl#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/index#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4648.txt#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4701.txt#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc5155.txt#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/api#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/configure.in#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/support.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/netdb.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/include/resolv.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/irp.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/assertions.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/logging.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/port_after.h.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/port_before.h.in#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/api#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/check.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/acache.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/adb.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/api#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/cache.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dispatch.c#7 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dst_parse.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dst_parse.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/journal.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/master.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/masterdump.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/message.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/openssldsa_link.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rbt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rbtdb.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/request.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#9 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rootns.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/sdb.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/tkey.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/tsig.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/validator.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/view.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/xfrin.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/zone.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/api#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/assertions.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/portset.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/types.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mem.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/portset.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/print.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/timer.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/app.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/net.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/resource.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/socket.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/time.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccfg/api#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccfg/namedconf.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/api#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/make/rules.in#5 integrate
.. //depot/projects/soc2005/libalias/contrib/bind9/version#10 integrate
.. //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/GNUmakefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/TODO#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/config.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/csup.1#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/detailer.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/diff.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/diff.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/fattr.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/fattr.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/keyword.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/keyword.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/lex.rcs.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/lister.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/misc.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/misc.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/mux.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/proto.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/proto.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/rcsfile.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rcsfile.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rcsparse.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rcsparse.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rcstokenizer.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rcstokenizer.l#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rsyncfile.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/rsyncfile.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/csup/status.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/stream.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/stream.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/csup/updater.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/AUTHORS#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/COPYING#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/ChangeLog#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/FREEBSD-upgrade#4 delete
.. //depot/projects/soc2005/libalias/contrib/file/INSTALL#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/LEGAL.NOTICE#3 delete
.. //depot/projects/soc2005/libalias/contrib/file/MAINT#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/adventure#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/animation#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/apple#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/archive#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/audio#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/c-lang#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/c64#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/cafebabe#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/cddb#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/clarion#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/commands#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/compress#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/console#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/cracklib#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/ctags#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/database#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/diff#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/dump#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/elf#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/erlang#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/filesystems#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/flash#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/fonts#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/fortran#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/frame#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/freebsd#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/fsav#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/games#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/gimp#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnome-keyring#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnu#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/gnumeric#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/graphviz#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/hp#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/iff#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/images#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/inform#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/java#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/jpeg#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/kde#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/lex#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/linux#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/lisp#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/llvm#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/lua#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/luks#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/macintosh#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mail.news#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mathcad#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mathematica#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mercurial#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/misctools#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mozilla#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/msdos#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/mup#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/netware#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/ole2compounddocs#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/os2#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/palm#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/pdf#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/perl#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/pgp#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/pkgadd#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/printer#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/psion#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/revision#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/riff#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/rpm#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/rtf#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/ruby#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/sc#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/scientific#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/securitycerts#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/sgi#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/sgml#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/sharc#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/sketch#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/softquad#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/spectrum#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/tex#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/troff#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/unicode#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/uuencode#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/varied.script#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/vorbis#2 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/warc#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/weak#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/windows#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/wordprocessors#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Magdir/xilinx#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/Makefile.am#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/Makefile.std#2 delete
.. //depot/projects/soc2005/libalias/contrib/file/NEWS#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/PORTING#2 delete
.. //depot/projects/soc2005/libalias/contrib/file/README#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/TODO#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/acinclude.m4#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/aclocal.m4#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/apprentice.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/ascmagic.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/asprintf.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/compile#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/compress.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/config.guess#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/config.h.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/config.sub#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/configure#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/configure.ac#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/configure.in#4 delete
.. //depot/projects/soc2005/libalias/contrib/file/elfclass.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/file.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/file.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/file.man#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/fsmagic.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/funcs.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/getopt_long.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/is_tar.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/libmagic.man#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/magic.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/magic.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/magic.man#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/magic.mime#4 delete
.. //depot/projects/soc2005/libalias/contrib/file/magic2mime#3 delete
.. //depot/projects/soc2005/libalias/contrib/file/mkinstalldirs#4 delete
.. //depot/projects/soc2005/libalias/contrib/file/mygetopt.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/names.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/patchlevel.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/print.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/readelf.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/readelf.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/softmagic.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/file/tar.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/file/test.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/file/tests/Makefile.am#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/Makefile.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/README#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.magic#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.result#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/gedcom.testfile#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/tests/test.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/file/vasprintf.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/gcc/c-cppbuiltin.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gcc/c-decl.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gcc/c-opts.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gcc/c-tree.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gcc/c-typeck.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gcc/doc/extend.texi#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/README#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_Qfmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g__fmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_ddfmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_dfmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_ffmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_xLfmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/g_xfmt.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoa_fltrnds.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoaimp.h#5 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/gethex.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/makefile#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/smisc.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtod.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtodg.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtof.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopQ.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopd.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopdd.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopf.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopx.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/strtopxL.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Q.ou0#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Q.ou1#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/Qtest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/README#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/d.out#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dI.out#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dIsi.out#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dItest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dd.out#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ddsi.out#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ddtest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dt.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dtest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/dtst.out#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/f.out#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/ftest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/getround.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/makefile#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/rtestnos#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtoIdSI.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtoIddSI.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtodISI.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtodt.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtopddSI.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/strtorddSI.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos1#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/testnos3#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/x.ou0#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/x.ou1#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xL.ou0#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xL.ou1#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xLtest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xQtest.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xsum0.out#4 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/test/xtest.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/gdtoa/xsum0.out#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/COPYING#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ChangeLog#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-Xlist#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/FREEBSD-upgrade#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/Makefile#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/README#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/accounting.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/aes_wrap.h#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ap.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ap_list.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/beacon.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/build_config.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/common.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/common.h#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/config.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/config.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/config_types.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/crypto.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ctrl_iface.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/defconfig#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/defs.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/des.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/developer.txt#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/code_structure.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.fast#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/doxygen.full#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/eap.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/hostapd.fig#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/mainpage.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/doc/porting.doxygen#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/driver.h#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/driver_test.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_aka.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_defs.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gpsk_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_gtc.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_i.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_identity.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_md5.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_methods.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_mschapv2.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_pax_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_peap.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_psk_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sake_common.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_sim_db.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tls_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_tlv.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_ttls.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eap_vendor_test.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eapol_sm.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eloop.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_none.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/eloop_win.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostap_common.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.8#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.accept#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.conf#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.deny#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.eap_user#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.radius_clients#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.sim_db#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.vlan#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd.wpa_psk#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.1#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hostapd_cli.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/hw_features.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/iapp.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11_auth.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_11h.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ieee802_1x.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/includes.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/l2_packet_none.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/README#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/hostapd#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/logwatch/hostapd.conf#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/madwifi.conf#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/md4.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/md5.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/md5.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/milenage.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/mlme.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/ms_funcs.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/os.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/os_internal.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/os_none.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/os_unix.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/pmksa_cache.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/preauth.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius.h#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_client.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/radius_server.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/rc4.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/reconfig.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sha1.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sha256.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/sta_info.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/state_machine.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/tls.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/tls_gnutls.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/tls_none.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/tls_openssl.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/version.h#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/vlan_init.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wired.conf#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wme.c#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wme.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.c#4 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_common.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.c#3 delete
.. //depot/projects/soc2005/libalias/contrib/hostapd/wpa_ctrl.h#3 delete
.. //depot/projects/soc2005/libalias/contrib/less/line.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/CHANGES#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/CREDITS#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/FILES#3 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/FREEBSD-Xlist#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/INSTALL.txt#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/Makefile.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/README#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.Win32#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.aix#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.dag#4 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.hpux#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.linux#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.macosx#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.septel#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/README.tru64#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/VERSION#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/acsite.m4#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/atmuni31.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/bpf_dump.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/bpf_image.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/chmod_bpf#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/config.h.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/configure#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/configure.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/dlpisubs.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/dlpisubs.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.html#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.txt#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/doc/pcap.xml#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/etherent.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/ethertype.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/fad-getad.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/fad-gifc.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/fad-glifc.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/fad-sita.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/fad-win32.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/filtertest.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/findalldevstest.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/gencode.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/grammar.y#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/ieee80211.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/inet.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/missing/snprintf.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/mkdep#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/nametoaddr.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/net/bpf_filter.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/optimize.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/packaging/pcap.spec.in#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bpf.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bt-linux.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-bt-linux.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-config.1#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-config.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dag.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dlpi.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-dos.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-enet.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-filter.manmisc#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-filter.manmisc.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-int.h#5 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-libdlpi.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linktype.manmisc#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linktype.manmisc.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-linux.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-namedb.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-nit.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-nit.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-null.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-pf.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-pf.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-savefile.manfile#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-savefile.manfile.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-septel.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-septel.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-sita.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-snit.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-snoop.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-stdinc.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-usb-linux.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-usb-linux.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap-win32.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3#4 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/bluetooth.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/bpf.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/namedb.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/pcap.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/sll.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/usb.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap/vlan.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap1.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_activate.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_breakloop.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_close.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_compile.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_compile.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_create.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_close.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_file.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_flush.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_open.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_file.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_fileno.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_findalldevs.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_freealldevs.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_freecode.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_geterr.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_inject.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_is_swapped.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lib_version.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lookupdev.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_lookupnet.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_loop.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_major_version.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_next_ex.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_offline_filter.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_dead.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_live.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_offline.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_datalink.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_promisc.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_set_timeout.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setdirection.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setfilter.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_setnonblock.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_snapshot.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_stats.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_statustostr.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/pcap_strerror.3pcap#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/runlex.sh#1 branch
.. //depot/projects/soc2005/libalias/contrib/libpcap/savefile.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/scanner.l#4 integrate
.. //depot/projects/soc2005/libalias/contrib/libpcap/sll.h#2 delete
.. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/extern.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/ftpcmd.y#3 integrate
.. //depot/projects/soc2005/libalias/contrib/lukemftpd/src/ftpd.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2005/libalias/contrib/netcat/nc.1#5 integrate
.. //depot/projects/soc2005/libalias/contrib/netcat/netcat.c#6 integrate
.. //depot/projects/soc2005/libalias/contrib/ntp/ntpd/ntp_crypto.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/CREDITS#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/INSTALL#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/Makefile.am#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/NEWS#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/README#6 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/TODO#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/VERSION#8 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/Makefile.am#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.8#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/audit/audit.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/Makefile.am#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/audit_warn.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.8#6 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.c#8 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.h#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bin/praudit/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/Makefile.am#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/audit_uevents.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/auditd_lib.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/bsm/libbsm.h#7 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/compat/endian.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h#7 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/config/config.h.in#6 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/configure#9 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#9 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_control#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/etc/audit_event#8 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/Makefile.am#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/Makefile.in#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/auditd_lib.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libauditd/libauditd.3#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/Makefile.am#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_control.3#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_domain.3#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_errno.3#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_socket_type.3#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/au_token.3#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/audit_submit.3#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_audit.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_class.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_control.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_domain.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_errno.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_event.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_io.c#7 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_mask.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#10 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_user.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_wrappers.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/libbsm.3#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/man/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit.log.5#6 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit_control.5#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/man/audit_user.5#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/man/auditon.2#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/modules/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/Makefile.in#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/Makefile.am#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/Makefile.in#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_domain.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_errno.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/bsm/generate.c#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/E2BIG_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EACCES_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EBADF_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EBUSY_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ECHILD_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EDEADLK_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EEXIST_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EFAULT_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EFBIG_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EINTR_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EINVAL_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EIO_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EISDIR_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EMFILE_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EMLINK_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENFILE_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENODEV_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOENT_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOEXEC_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOMEM_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOSPC_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTBLK_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTDIR_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENOTTY_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ENXIO_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EPERM_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EPIPE_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EROFS_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ESPIPE_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ESRCH_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ETXTBSY_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/EXDEV_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/arg32_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/data_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/data_token#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/file_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/header32_token#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/in_addr_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ip_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/ipc_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/iport_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/opaque_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/path_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64_record#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/return32_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/return32_token#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/seq_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/socketex_record#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/socketex_token#1 branch
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/subject32_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/subject32ex_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/text_record#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/test/reference/zonename_record#2 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/tools/Makefile.in#5 integrate
.. //depot/projects/soc2005/libalias/contrib/openbsm/tools/audump.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/openpam/include/security/openpam.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_dynamic.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/opie/opiekey.1#2 integrate
.. //depot/projects/soc2005/libalias/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate
.. //depot/projects/soc2005/libalias/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/CHANGES#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/CREDITS#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/FILES#4 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/FREEBSD-Xlist#1 branch
.. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL#4 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/INSTALL.txt#1 branch
.. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile-devel-adds#2 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/Makefile.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/PLATFORMS#2 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/README#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/Readme.Win32#2 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/TODO#2 delete
.. //depot/projects/soc2005/libalias/contrib/tcpdump/VERSION#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.c#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/addrtoname.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/af.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/af.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/aodv.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/appletalk.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/arcnet.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/atm.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/atmuni31.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/bgp.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/bootp.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/bpf_dump.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/chdlc.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/checksum.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/tcpdump/config.h.in#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/configure#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/configure.in#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/dccp.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/decnet.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/enc.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ether.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ethertype.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/extract.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/fddi.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/gmpls.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/gmpls.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/gmt2local.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/gmt2local.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/icmp6.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11.h#4 integrate
.. //depot/projects/soc2005/libalias/contrib/tcpdump/ieee802_11_radio.h#4 integrate

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

From owner-p4-projects@FreeBSD.ORG  Thu Apr  2 15:23:20 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DC531065674; Thu,  2 Apr 2009 15:23:20 +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 D0DDC1065676
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 15:23:19 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BE20F8FC20
	for <perforce@FreeBSD.org>; Thu,  2 Apr 2009 15:23:19 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n32FNJt9052848
	for <perforce@FreeBSD.org>; Thu, 2 Apr 2009 15:23:19 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n32FNJC2052846
	for perforce@freebsd.org; Thu, 2 Apr 2009 15:23:19 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 2 Apr 2009 15:23:19 GMT
Message-Id: <200904021523.n32FNJC2052846@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160149 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: Thu, 02 Apr 2009 15:23:21 -0000

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

Change 160149 by rene@rene_self on 2009/04/02 15:23:10

	Update draft translation of solid-state to cvs 1.14

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#9 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#9 (text+ko) ====

@@ -30,7 +30,7 @@
      $FreeBSD: $
 
      %SOURCE%	en_US.ISO8859-1/articles/solid-state/article.sgml
-     %SRCID%	1.13
+     %SRCID%	1.14
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -56,12 +56,12 @@
 
     <copyright>
       <year>2001</year>
+      <year>2009</year>
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.m-systems;
       &tm-attrib.general;
     </legalnotice>
 
@@ -120,25 +120,14 @@
       getal varieert vanwege de omgevingstemperatuur.</para>
 
     <para>In het bijzonder worden ATA-compatibele compact-flash eenheden
-      en de M-Systems &diskonchip; flash-geheugeneenheid besproken.
-      ATA-compatibele flash-kaarten zijn vrij populair als opslagmedium
-      voor digitale camera's.  Bijzonder interessant is het feit dat de
-      pinnen ervan precies met die van de IDE-bus overeenkomen en dat ze
-      compatibel zijn met de ATA-commandoverzamling.  Daarom kunnen deze
-      apparaten direct aan een IDE-bus in een computer gekoppeld worden
-      met een zeer eenvoudige en goedkope adaptor.  Eenmaal op deze
-      wijze ge&iuml;mplementeerd zien besturingssystemen zoals &os; het
-      apparaat als een normale harde schijf (doch klein).  Het product
-      M-Systems &diskonchip; is gebaseerd op dezelfde onderliggende
-      flash-geheugentechnologie als ATA-compatibele compact-flash
-      kaarten, maar heeft een DIP-vorm en is niet ATA-compatibel.  Om
-      zo'n apparaat te gebruiken, moet u het niet alleen op een
-      moederbord installeren dat een &diskonchip;-stekker heeft, u moet
-      ook het stuurprogramma `fla` in elke &os;-kernel bouwen waarmee u
-      het wilt gebruiken.  Verder verblijven er kritieke,
-      fabrikantspecifieke gegevens in de opstartsector van dit apparaat,
-      dus moet u ervoor oppassen dat u niet de &os; (of enig andere)
-      bootloader installeert wanneer u dit gebruikt.</para>
+      besproken, welke vrij populair zijn als opslagmedium voor digitale
+      camera's.  Bijzonder interessant is het feit dat de pinnen ervan
+      precies met die van de IDE-bus overeenkomen en dat ze compatibel
+      zijn met de ATA-commandoverzameling.  Daarom kunnen deze apparaten
+      direct aan een IDE-bus in een computer gekoppeld worden met een
+      zeer eenvoudige en goedkope adaptor.  Eenmaal op deze wijze
+      ge&iuml;mplementeerd zien besturingssystemen zoals &os; het
+      apparaat als een normale harde schijf (doch klein).</para>
 
     <para>Er bestaan nog andere solid state disk-oplossingen, maar hun
       kosten, zeldzaamheid, en relatieve gebruiksongemak plaatst ze
@@ -170,11 +159,6 @@
     <programlisting>options         MFS             # Geheugenbestandssysteem
 options         MD_ROOT         # md-apparaat bruikbaar als een potentieel root-apparaat
 pseudo-device   md              # geheugenschijf</programlisting>
-
-    <para>Ten tweede, als u het M-Systems &diskonchip;-product gaat
-      gebruiken, moet u ook deze regel opnemen:</para>
-
-    <programlisting>device          fla0    at isa?</programlisting>
   </sect1>
 
   <sect1 id="ro-fs">
@@ -279,13 +263,9 @@
     <title>Een bestandssysteem uit het niets opbouwen</title>
 
     <para>Omdat ATA-compatibele compact-flash-kaarten door &os; als
-      normale IDE harde schijven worden gezien, wat een M-Systems
-      &diskonchip; product is (wanneer u een kernel draait met daarin
-      het stuurprogramma fla ingebouwd), kunt u theoretisch &os; vanaf
-      het netwerk installeren door de floppies kern en mfsroot of een
-      CD te gebruiken.  Afgezien van het feit dat u geen bootloader van
-      welke soort dan ook naar het M-Systems apparaat moet schrijven,
-      zijn er geen speciale instructies nodig.</para>
+      normale IDE harde schijven worden gezien, kunt u theoretisch &os;
+      vanaf het netwerk installeren door de floppies kern en mfsroot of
+      een CD te gebruiken.</para>
 
     <para>Zelfs een kleine installatie van &os; die normale
       installatieprocedures gebruikt kan echter een systeem produceren
@@ -306,12 +286,7 @@
       installatie wordt uitgevoerd, moeten bewerkingen zoals partitioneren,
       labelen, het aanmaken van bestandssystemen, etc. met de hand
       uitgevoerd worden.  Naast de floppies kern en mfsroot heeft u ook
-      de floppy fixit nodig.  Als u een M-Systems &diskonchip; gebruikt,
-      moet de kernel op uw floppy kern de optie <literal>fla</literal>
-      zoals uitgelegd in <xref linkend="kernel"> in zich gecompileerd
-      hebben.  Bekijk alstublieft <xref linkend="kern.flp"> voor
-      instructies over hoe een nieuwe kernel voor
-      <filename>kern.flp</filename> aan te maken.</para>
+      de floppy fixit nodig.</para>
 
     <procedure>
       <step>
@@ -327,9 +302,7 @@
 	  type of the partition, make sure the value is set to
 	  <literal>165</literal>.  Now write this partition table to the disk
 	  by pressing the <keycap>w</keycap> key (this is a hidden option on
-	  this screen).  When presented with a menu to choose a boot manager,
-	  take care to select <literal>None</literal> if you are using an
-	  M-Systems &diskonchip;.  If you are using an ATA compatible compact
+	  this screen).  If you are using an ATA compatible compact
 	  flash card, you should choose the FreeBSD Boot Manager.  Now press
 	  the <keycap>q</keycap> key to quit the partition menu.  You will be
 	  shown the boot manager menu once more - repeat the choice you made
@@ -343,35 +316,11 @@
 	  installation menu choose the <literal>fixit</literal> option.  After
 	  entering the fixit environment, enter the following commands:</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>mknod /dev/ad0a c 116 0</userinput>
+	<para><screen>&prompt.root; <userinput>mknod /dev/ad0a c 116 0</userinput>
 &prompt.root; <userinput>mknod /dev/ad0c c 116 2</userinput>
-&prompt.root; <userinput>disklabel -e /dev/ad0c</userinput></screen></para></entry>
-
-		<entry><para><screen>&prompt.root; <userinput>mknod /dev/fla0a c 102 0</userinput>
-&prompt.root; <userinput>mknod /dev/fla0c c 102 2</userinput>
-&prompt.root; <userinput>disklabel -e /dev/fla0c</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
-
+&prompt.root; <userinput>disklabel -e /dev/ad0c</userinput></screen></para>
 	<para>At this point you will have entered the vi editor under the
-	  auspices of the disklabel command.  If you are using &diskonchip;,
-	  the first step will be to change the type value near the beginning
-	  of the file from <literal>ESDI</literal> to
-	  <literal>DOC2K</literal>.  Next, regardless of whether you are using
-	  &diskonchip; or ATA compatible compact flash media, you need to add
+	  auspices of the disklabel command.  Next, you need to add
 	  an <literal>a:</literal> line at the end of the file.  This
 	  <literal>a:</literal> line should look like:</para>
 
@@ -384,26 +333,8 @@
 	  sure that fstype is <literal>4.2BSD</literal>.  Save the file and
 	  exit.</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>disklabel -B -r /dev/ad0c</userinput>
-&prompt.root; <userinput>newfs /dev/ad0a</userinput></screen></para></entry>
-
-		<entry><para><screen>&prompt.root; <userinput>disklabel -B -r /dev/fla0c</userinput>
-&prompt.root; <userinput>newfs /dev/fla0a</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
+	<para><screen>&prompt.root; <userinput>disklabel -B -r /dev/ad0c</userinput>
+&prompt.root; <userinput>newfs /dev/ad0a</userinput></screen></para>
       </step>
 
       <step>
@@ -411,25 +342,8 @@
 
 	<para>Mount the newly prepared flash media:</para>
 
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="2">
-	    <thead>
-	      <row>
-		<entry align="center">ATA compatible</entry>
-
-		<entry align="center">&diskonchip;</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry><para><screen>&prompt.root; <userinput>mount /dev/ad0a /flash</userinput></screen></para></entry>
+	<para><screen>&prompt.root; <userinput>mount /dev/ad0a /flash</userinput></screen></para>
 
-		<entry><para><screen>&prompt.root; <userinput>mount /dev/fla0a /flash</userinput></screen></para></entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
-
 	<para>Bring this machine up on the network so we may transfer our tar
 	  file and explode it onto our flash media filesystem.  One example of
 	  how to do this is:</para>
@@ -471,53 +385,6 @@
     </procedure>
   </sect1>
 
-  <sect1 id="kern.flp">
-    <title>Building a <filename>kern.flp</filename> Installation Floppy with
-      the fla Driver</title>
-
-    <note>
-      <para>This section of the article is relevant only to those using
-	M-Systems &diskonchip; flash media.</para>
-    </note>
-
-    <para>It is possible that your <filename>kern.flp</filename> boot floppy
-      does not have a kernel with the <devicename>fla</devicename> driver
-      compiled into it necessary for the system to recognize the &diskonchip;.
-      If you have booted off of the installation floppies and are told that no
-      disks are present, then you are probably lacking the
-      <devicename>fla</devicename> driver in your kernel.</para>
-
-    <para>After you have built a kernel with <devicename>fla</devicename>
-      support that is smaller than 1.4 megabytes, you can create a custom
-      <filename>kern.flp</filename> floppy image with it by following these
-      instructions:</para>
-
-    <procedure>
-      <step>
-	<para>Obtain an existing kern.flp image file</para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>vnconfig vn0c kern.flp</userinput></screen></para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>mount /dev/vn0c /mnt</userinput></screen></para>
-      </step>
-
-      <step>
-	<para>Place your kernel file into <filename>/mnt</filename>, replacing
-	  the existing one</para>
-      </step>
-
-      <step>
-	<para><screen>&prompt.root; <userinput>vnconfig -d vn0c</userinput></screen></para>
-      </step>
-    </procedure>
-
-    <para>Your <filename>kern.flp</filename> file now has your new kernel on it.</para>
-  </sect1>
-
   <sect1 id="strategies">
     <title>System Strategies for Small and Read Only Environments</title>
 

From owner-p4-projects@FreeBSD.ORG  Fri Apr  3 10:07:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B2E51065676; Fri,  3 Apr 2009 10:07:51 +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 DC26D1065673
	for <perforce@freebsd.org>; Fri,  3 Apr 2009 10:07:50 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C87DD8FC18
	for <perforce@freebsd.org>; Fri,  3 Apr 2009 10:07:50 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n33A7ogN022430
	for <perforce@freebsd.org>; Fri, 3 Apr 2009 10:07:50 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n33A7oOx022428
	for perforce@freebsd.org; Fri, 3 Apr 2009 10:07:50 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 3 Apr 2009 10:07:50 GMT
Message-Id: <200904031007.n33A7oOx022428@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160170 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: Fri, 03 Apr 2009 10:07:52 -0000

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

Change 160170 by rwatson@rwatson_cinnamon on 2009/04/03 10:07:20

	Fix a bug introduced by me in audit_submit(3), in which we apply
	local->BSM errno conversion to the return value field rather than
	the status field.
	
	Spotted by:	sson

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#37 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#37 (text+ko) ====

@@ -11,6 +11,8 @@
 - Interface to convert between local and BSM fcntl(2) command values has been
   added:  au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with 
   definitions of constants in audit_fcntl.h.
+- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens
+  generated by audit_submit(3) were improperly encoded has been fixed.
 
 OpenBSM 1.1 beta 1
 
@@ -443,4 +445,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#36 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#37 $

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#30 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#31 $
  */
 
 #ifdef __APPLE__
@@ -178,7 +178,7 @@
 			return (-1);
 		}
 	}
-	token = au_to_return32(status, au_errno_to_bsm(reterr));
+	token = au_to_return32(au_errno_to_bsm(status), reterr);
 	if (token == NULL) {
 		syslog(LOG_AUTH | LOG_ERR,
 		    "audit: enable to build return token");

From owner-p4-projects@FreeBSD.ORG  Fri Apr  3 13:19:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DFE1106566B; Fri,  3 Apr 2009 13:19:07 +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 DDBC61065673
	for <perforce@FreeBSD.org>; Fri,  3 Apr 2009 13:19:06 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CBD7D8FC15
	for <perforce@FreeBSD.org>; Fri,  3 Apr 2009 13:19:06 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n33DJ6ov053580
	for <perforce@FreeBSD.org>; Fri, 3 Apr 2009 13:19:06 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n33DJ6nG053578
	for perforce@freebsd.org; Fri, 3 Apr 2009 13:19:06 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 3 Apr 2009 13:19:06 GMT
Message-Id: <200904031319.n33DJ6nG053578@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160174 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: Fri, 03 Apr 2009 13:19:08 -0000

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

Change 160174 by pgj@petymeg on 2009/04/03 13:18:37

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/community/mailinglists.sgml#3 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#45 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#11 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/community/mailinglists.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/community/mailinglists.sgml,v 1.16 2009/02/14 11:43:13 pgj Exp $">
+<!ENTITY date "$FreeBSD: www/en/community/mailinglists.sgml,v 1.17 2009/04/02 09:25:50 pgj Exp $">
 <!ENTITY title "Mailing Lists">
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
@@ -55,8 +55,8 @@
 
       <li><strong>Hungarian</strong> -- <a
 	  href="mailto:bsd@hu.FreeBSD.org">bsd@hu.FreeBSD.org</a>, <a
-	  href="http://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration</a>
-	or <a href="http://lists.hu.FreeBSD.org/bsd/cgi/search.cgi">Search</a>.</li>
+	  href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration</a>
+	or <a href="http://lists.hu.FreeBSD.org/pipermail/bsd/">Search</a>.</li>
 
       <li><strong>Indonesian</strong> -- <a
 	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#45 (text+ko) ====

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.235 2009/03/25 19:43:16 skreuzer Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.237 2009/04/03 11:57:04 blackend Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,6 +33,27 @@
     <name>2009</name>
 
     <month>
+      <name>4</name>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <title>FreeBSD 7.2-BETA1 Available</title>
+
+	  <p>The final stage of the &os; 7.2-RELEASE cycle has begun
+	    with the first beta release.  ISO images for Tier-1
+	    architectures are now <a
+	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2009-April/049233.html">available</a>
+	    on most of the <a
+
+href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os; mirror
+sites</a>.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>3</name>
 
       <day>
@@ -51,7 +72,7 @@
 	  <title>The &os; Project participates in the Google Summer of
 	    Code 2009 program</title>
 
-	  <p>We are pleased to annouce that Google has invited the &os;
+	  <p>We are pleased to announce that Google has invited the &os;
 	    Project to participate in their Summer of Code 2009 program,
 	    which allows students to get paid to work on the &os; source
 	    code.  We invite students interested in working on &os; to

==== //depot/projects/docproj_hu/www/share/sgml/release.ent#11 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.31 2009/01/11 22:11:41 marcus Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.32 2009/04/03 11:34:44 blackend Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -28,10 +28,10 @@
 <!-- If there is no release currently in the release cycle (i.e. we
       don't have something in BETAn or RCn), then change %beta.testing
       below to "IGNORE".  If we do, use "INCLUDE". -->
-<!ENTITY beta.testing "IGNORE">
-<!ENTITY % beta.testing "IGNORE">
-<!ENTITY betarel.current '7.1'>
-<!ENTITY betarel.vers 'RC2'>
+<!ENTITY beta.testing "INCLUDE">
+<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY betarel.current '7.2'>
+<!ENTITY betarel.vers 'BETA1'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y

From owner-p4-projects@FreeBSD.ORG  Fri Apr  3 13:41:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7056D1065675; Fri,  3 Apr 2009 13:41:30 +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 009B1106566C
	for <perforce@FreeBSD.org>; Fri,  3 Apr 2009 13:41:29 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DDE638FC1E
	for <perforce@FreeBSD.org>; Fri,  3 Apr 2009 13:41:29 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n33DfTQk055425
	for <perforce@FreeBSD.org>; Fri, 3 Apr 2009 13:41:29 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n33DfTOt055423
	for perforce@freebsd.org; Fri, 3 Apr 2009 13:41:29 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 3 Apr 2009 13:41:29 GMT
Message-Id: <200904031341.n33DfTOt055423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 160177 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: Fri, 03 Apr 2009 13:41:34 -0000

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

Change 160177 by pgj@petymeg on 2009/04/03 13:40:44

	MFen (www):
		1.235 -> 1.237	hu/share/sgml/news.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#8 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#8 (text+ko) ====

@@ -5,7 +5,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
      %SOURCE%   share/sgml/news.xml
-     %SRCID%    1.235
+     %SRCID%    1.237
 -->
 
 <news>
@@ -19,6 +19,29 @@
     <name>2009</name>
 
     <month>
+      <name>4</name>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <title>Megjelent a &os;&nbsp;7.2-BETA1!</title>
+
+	  <p>Az els&#245; b&eacute;ta v&aacute;ltozat
+	    megjelentet&eacute;s&eacute;vel megkezd&#245;d&ouml;tt a
+	    &os;&nbsp;7.2-RELEASE kiad&aacute;s ciklus&aacute;n&aacute;k
+	    utols&oacute; szakasza.  Mostant&oacute;l m&aacute;r a
+	    legt&ouml;bb <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">t&uuml;kr&ouml;z&eacute;sen</a>
+	    <a
+	      href="http://lists.freebsd.org/pipermail/freebsd-stable/2009-April/049233.html">el&eacute;rhet&#245;ek</a>
+	    lemezk&eacute;pek az &ouml;sszes Tier&nbsp;1
+	    architekt&uacute;r&aacute;hoz.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>3</name>
 
       <day>

From owner-p4-projects@FreeBSD.ORG  Sat Apr  4 14:42:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C7F8C106566C; Sat,  4 Apr 2009 14:42:04 +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 846B51065670
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 14:42:04 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7032D8FC1F
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 14:42:04 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n34Eg4VZ070836
	for <perforce@freebsd.org>; Sat, 4 Apr 2009 14:42:04 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n34Eg23Z070834
	for perforce@freebsd.org; Sat, 4 Apr 2009 14:42:02 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Sat, 4 Apr 2009 14:42:02 GMT
Message-Id: <200904041442.n34Eg23Z070834@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160201 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: Sat, 04 Apr 2009 14:42:05 -0000

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

Change 160201 by nwhitehorn@nwhitehorn_comporellon on 2009/04/04 14:41:42

	IFC after integration of 64-bit bridge code to HEAD.

Affected files ...

.. //depot/projects/ppc-g5/Makefile#5 integrate
.. //depot/projects/ppc-g5/ObsoleteFiles.inc#12 integrate
.. //depot/projects/ppc-g5/contrib/csup/rcsfile.c#2 integrate
.. //depot/projects/ppc-g5/contrib/csup/rcsfile.h#2 integrate
.. //depot/projects/ppc-g5/contrib/csup/rcsparse.c#2 integrate
.. //depot/projects/ppc-g5/contrib/csup/updater.c#5 integrate
.. //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 integrate
.. //depot/projects/ppc-g5/contrib/libpcap/pcap/pcap.h#2 integrate
.. //depot/projects/ppc-g5/etc/rc.d/ipfw#2 integrate
.. //depot/projects/ppc-g5/include/dlfcn.h#2 integrate
.. //depot/projects/ppc-g5/include/mpool.h#2 integrate
.. //depot/projects/ppc-g5/include/stdio.h#4 integrate
.. //depot/projects/ppc-g5/lib/libc/db/README#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/Symbol.map#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_debug.c#4 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_open.c#4 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_page.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_put.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/btree/bt_split.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/db/db.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/README#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash.h#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash_bigkey.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash_buf.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash_func.c#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash_log2.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/hash/hash_page.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/man/mpool.3#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/mpool/Makefile.inc#2 integrate
.. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool-compat.c#1 branch
.. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool.c#4 integrate
.. //depot/projects/ppc-g5/lib/libc/db/recno/rec_close.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/db/recno/rec_put.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/ppc-g5/lib/libc/gen/Symbol.map#4 integrate
.. //depot/projects/ppc-g5/lib/libc/gen/dlfcn.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/gen/dlfunc.c#2 delete
.. //depot/projects/ppc-g5/lib/libc/gen/dlopen.3#2 integrate
.. //depot/projects/ppc-g5/lib/libc/gen/getcap.c#2 integrate
.. //depot/projects/ppc-g5/lib/libc/i386/sys/Makefile.inc#3 integrate
.. //depot/projects/ppc-g5/lib/libc/net/getaddrinfo.c#3 integrate
.. //depot/projects/ppc-g5/lib/libc/nls/Makefile.inc#3 integrate
.. //depot/projects/ppc-g5/lib/libc/nls/be_BY.UTF-8.msg#1 branch
.. //depot/projects/ppc-g5/lib/libc/nls/de_DE.ISO8859-1.msg#2 integrate
.. //depot/projects/ppc-g5/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/ppc-g5/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/ppc-g5/lib/libc/sys/ptrace.2#2 integrate
.. //depot/projects/ppc-g5/lib/libpmc/pmc.h#2 integrate
.. //depot/projects/ppc-g5/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/ppc-g5/lib/libstand/gets.c#2 integrate
.. //depot/projects/ppc-g5/lib/libthr/Makefile#4 integrate
.. //depot/projects/ppc-g5/lib/libufs/block.c#2 integrate
.. //depot/projects/ppc-g5/libexec/bootpd/rtmsg.c#3 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/Symbol.map#3 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.1#3 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#7 integrate
.. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.h#3 integrate
.. //depot/projects/ppc-g5/release/picobsd/bridge/PICOBSD#4 integrate
.. //depot/projects/ppc-g5/release/picobsd/bridge/config#2 integrate
.. //depot/projects/ppc-g5/release/picobsd/bridge/crunch.conf#3 integrate
.. //depot/projects/ppc-g5/release/picobsd/build/picobsd#5 integrate
.. //depot/projects/ppc-g5/release/picobsd/floppy.tree/etc/rc1#2 integrate
.. //depot/projects/ppc-g5/release/sparc64/mkisoimages.sh#2 integrate
.. //depot/projects/ppc-g5/sbin/geom/class/label/glabel.8#2 integrate
.. //depot/projects/ppc-g5/sbin/gvinum/gvinum.8#2 integrate
.. //depot/projects/ppc-g5/sbin/gvinum/gvinum.c#2 integrate
.. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#7 integrate
.. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#7 integrate
.. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#9 integrate
.. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.h#3 integrate
.. //depot/projects/ppc-g5/sbin/ipfw/main.c#3 integrate
.. //depot/projects/ppc-g5/share/man/man3/pthread.3#2 integrate
.. //depot/projects/ppc-g5/share/man/man4/Makefile#12 integrate
.. //depot/projects/ppc-g5/share/man/man4/ath.4#3 integrate
.. //depot/projects/ppc-g5/share/man/man4/ath_hal.4#3 integrate
.. //depot/projects/ppc-g5/share/man/man4/ed.4#2 integrate
.. //depot/projects/ppc-g5/share/man/man4/fla.4#2 delete
.. //depot/projects/ppc-g5/share/man/man4/lagg.4#2 integrate
.. //depot/projects/ppc-g5/share/man/man4/malo.4#2 integrate
.. //depot/projects/ppc-g5/share/man/man4/man4.i386/fe.4#2 integrate
.. //depot/projects/ppc-g5/share/man/man4/uath.4#1 branch
.. //depot/projects/ppc-g5/share/man/man4/wlan.4#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/Makefile#9 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_ATTRIB.9#3 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_CREATE.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_INACTIVE.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_IOCTL.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_LINK.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_LOCK.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_LOOKUP.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_OPENCLOSE.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_RDWR.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_READDIR.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_READLINK.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_REMOVE.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_RENAME.9#2 integrate
.. //depot/projects/ppc-g5/share/man/man9/VOP_VPTOCNP.9#3 integrate
.. //depot/projects/ppc-g5/share/man/man9/refcount.9#1 branch
.. //depot/projects/ppc-g5/share/man/man9/vm_map_lock.9#2 integrate
.. //depot/projects/ppc-g5/share/mk/bsd.cpu.mk#4 integrate
.. //depot/projects/ppc-g5/share/skel/dot.login#2 integrate
.. //depot/projects/ppc-g5/share/skel/dot.profile#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_switch.S#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakecode.S#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakeup.c#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/db_interface.c#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/db_trace.c#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/fpu.c#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/sys_machdep.c#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/amd64/vm_machdep.c#6 integrate
.. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_exception.S#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_misc.c#1 branch
.. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_reg.c#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_signal.c#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_sigtramp.S#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/asmacros.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/frame.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/md_var.h#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/pcb.h#5 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/pcpu.h#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/proc.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/reg.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/segments.h#3 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/signal.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/include/ucontext.h#2 integrate
.. //depot/projects/ppc-g5/sys/amd64/linux32/linux.h#7 integrate
.. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_locore.s#4 integrate
.. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/ppc-g5/sys/amd64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/ppc-g5/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/ppc-g5/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/ppc-g5/sys/arm/conf/CAMBRIA#4 integrate
.. //depot/projects/ppc-g5/sys/arm/include/atomic.h#4 integrate
.. //depot/projects/ppc-g5/sys/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/ppc-g5/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/ppc-g5/sys/cddl/dev/dtnfsclient/dtnfsclient.c#2 delete
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/ppc-g5/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#13 integrate
.. //depot/projects/ppc-g5/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/ppc-g5/sys/conf/files#15 integrate
.. //depot/projects/ppc-g5/sys/conf/files.amd64#10 integrate
.. //depot/projects/ppc-g5/sys/conf/files.i386#11 integrate
.. //depot/projects/ppc-g5/sys/conf/files.ia64#6 integrate
.. //depot/projects/ppc-g5/sys/conf/files.powerpc#17 integrate
.. //depot/projects/ppc-g5/sys/conf/newvers.sh#4 integrate
.. //depot/projects/ppc-g5/sys/conf/options#12 integrate
.. //depot/projects/ppc-g5/sys/contrib/dev/uath/ar5523.bin.uu#1 branch
.. //depot/projects/ppc-g5/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/age/if_agereg.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ahci.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-marvell.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-promise.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-sis.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#9 integrate
.. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#10 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#7 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drm_pciids.h#5 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/ax88x90reg.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/dl100xxreg.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/if_ed_pccard.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/if_ed_wd80x3.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/fe/if_fe_pccard.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.h#3 integrate
.. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#9 integrate
.. //depot/projects/ppc-g5/sys/dev/ipmi/ipmi_linux.c#1 branch
.. //depot/projects/ppc-g5/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/malo/if_malo_pci.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/ppc-g5/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/ppc-g5/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#5 integrate
.. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#7 integrate
.. //depot/projects/ppc-g5/sys/dev/pccard/pccarddevs#4 integrate
.. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate
.. //depot/projects/ppc-g5/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#15 integrate
.. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uath.c#1 branch
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathreg.h#1 branch
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathvar.h#1 branch
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_ural.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/usb/wlan/usb_wlan.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/ppc-g5/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/ppc-g5/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/ppc-g5/sys/dev/xen/balloon/balloon.c#3 integrate
.. //depot/projects/ppc-g5/sys/dev/xen/console/console.c#6 integrate
.. //depot/projects/ppc-g5/sys/geom/geom.h#3 integrate
.. //depot/projects/ppc-g5/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/geom_disk.h#2 integrate
.. //depot/projects/ppc-g5/sys/geom/geom_subr.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/ppc-g5/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/ppc-g5/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/ppc-g5/sys/geom/label/g_label_ufs.c#2 integrate
.. //depot/projects/ppc-g5/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part.c#10 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#9 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_ebr.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#8 integrate
.. //depot/projects/ppc-g5/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_drive.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_list.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_plex.c#4 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rename.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/ppc-g5/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/ppc-g5/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/ppc-g5/sys/i386/include/signal.h#2 integrate
.. //depot/projects/ppc-g5/sys/i386/include/ucontext.h#2 integrate
.. //depot/projects/ppc-g5/sys/i386/include/xen/xenpmap.h#4 integrate
.. //depot/projects/ppc-g5/sys/i386/include/xen/xenvar.h#3 integrate
.. //depot/projects/ppc-g5/sys/i386/isa/npx.c#4 integrate
.. //depot/projects/ppc-g5/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/ppc-g5/sys/i386/xen/pmap.c#6 integrate
.. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#8 integrate
.. //depot/projects/ppc-g5/sys/ia64/ia32/ia32_misc.c#1 branch
.. //depot/projects/ppc-g5/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#5 integrate
.. //depot/projects/ppc-g5/sys/kern/subr_bus.c#8 integrate
.. //depot/projects/ppc-g5/sys/kern/sysv_sem.c#3 integrate
.. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#10 integrate
.. //depot/projects/ppc-g5/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#10 integrate
.. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/ppc-g5/sys/mips/include/bus.h#2 integrate
.. //depot/projects/ppc-g5/sys/modules/ath/Makefile#4 integrate
.. //depot/projects/ppc-g5/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/dtrace/dtnfsclient/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/geom/geom_vinum/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/ipmi/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/ipmi/ipmi_linux/Makefile#1 branch
.. //depot/projects/ppc-g5/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/ppc-g5/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/ppc-g5/sys/modules/usb/uath/Makefile#1 branch
.. //depot/projects/ppc-g5/sys/net/bpf.h#2 integrate
.. //depot/projects/ppc-g5/sys/net/if.c#13 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#7 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#6 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#10 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.h#7 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#7 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#7 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.h#3 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#9 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#6 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#9 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#10 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.c#6 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.h#3 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_sta.c#6 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.c#1 branch
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.h#1 branch
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.c#5 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.h#3 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#9 integrate
.. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#6 integrate
.. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#9 integrate
.. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#13 integrate
.. //depot/projects/ppc-g5/sys/netinet/ip_fw_pfil.c#6 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_indata.c#7 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_structs.h#5 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/ppc-g5/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.c#1 branch
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.h#1 branch
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/ppc-g5/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#12 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#7 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#5 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#11 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#7 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/uma_machdep.c#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/aim/vm_machdep.c#4 integrate
.. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#8 integrate
.. //depot/projects/ppc-g5/sys/powerpc/booke/uio_machdep.c#2 delete
.. //depot/projects/ppc-g5/sys/powerpc/include/hid.h#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#4 integrate
.. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/ppc-g5/sys/powerpc/include/sf_buf.h#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#6 integrate
.. //depot/projects/ppc-g5/sys/powerpc/include/vmparam.h#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#7 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/bus_machdep.c#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#6 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/dump_machdep.c#1 branch
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#4 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/mmu_if.m#3 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate
.. //depot/projects/ppc-g5/sys/powerpc/powerpc/uio_machdep.c#1 branch
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/atomic.S#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/copyinout.c#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/locore.S#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/machdep.c#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/mmu_oea64.c#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/swtch.S#1 add
.. //depot/projects/ppc-g5/sys/ppc64/ppc64/trap_subr.S#1 add
.. //depot/projects/ppc-g5/sys/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/ppc-g5/sys/security/mac_mls/mac_mls.c#5 integrate
.. //depot/projects/ppc-g5/sys/sys/dtrace_bsd.h#3 integrate
.. //depot/projects/ppc-g5/sys/sys/elf_common.h#6 integrate
.. //depot/projects/ppc-g5/sys/sys/jail.h#6 integrate
.. //depot/projects/ppc-g5/sys/sys/kerneldump.h#3 integrate
.. //depot/projects/ppc-g5/sys/sys/systm.h#6 integrate
.. //depot/projects/ppc-g5/sys/sys/vnode.h#11 integrate
.. //depot/projects/ppc-g5/sys/tools/vnode_if.awk#3 integrate
.. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/ppc-g5/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/ppc-g5/sys/xen/evtchn/evtchn.c#6 integrate
.. //depot/projects/ppc-g5/sys/xen/reboot.c#2 integrate
.. //depot/projects/ppc-g5/usr.bin/cut/cut.1#2 integrate
.. //depot/projects/ppc-g5/usr.bin/locate/locate/fastfind.c#2 integrate
.. //depot/projects/ppc-g5/usr.bin/locate/locate/util.c#2 integrate
.. //depot/projects/ppc-g5/usr.bin/login/login.c#2 integrate
.. //depot/projects/ppc-g5/usr.sbin/chown/chgrp.1#2 integrate
.. //depot/projects/ppc-g5/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate
.. //depot/projects/ppc-g5/usr.sbin/uathload/Makefile#1 branch
.. //depot/projects/ppc-g5/usr.sbin/uathload/uathload.c#1 branch

Differences ...

==== //depot/projects/ppc-g5/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $
+# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $
 #
 # The user-driven targets are:
 #
@@ -279,7 +279,7 @@
 # existing system is.
 #
 .if make(universe) || make(tinderbox)
-TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
 
 .if defined(DOING_TINDERBOX)
 FAILFILE=tinderbox.failed

==== //depot/projects/ppc-g5/ObsoleteFiles.inc#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.178 2009/03/19 20:33:26 thompsa Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.180 2009/04/01 09:37:00 trhodes Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1440,6 +1440,8 @@
 OLD_FILES+=lib/geom/geom_label.so.1
 OLD_FILES+=lib/geom/geom_nop.so.1
 OLD_FILES+=lib/geom/geom_stripe.so.1
+# 20040713: fla(4) removed.
+OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys

==== //depot/projects/ppc-g5/contrib/csup/rcsfile.c#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/contrib/csup/rcsfile.c,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.2 2009/03/25 20:15:48 lulf Exp $
  */
 
 #include <assert.h>
@@ -140,7 +140,7 @@
 			     struct delta *);
 static struct stream 	*rcsfile_getdeltatext(struct rcsfile *, struct delta *,
 			     struct buf **);
-static void		 rcsdelta_writestring(char *, size_t, struct stream *);
+static int		 rcsdelta_writestring(char *, size_t, struct stream *);
 static void		 rcsdelta_insertbranch(struct delta *, struct branch *);
 
 /* Space formatting of RCS file. */
@@ -308,14 +308,19 @@
 
 	/* First write head. */
 	d = LIST_FIRST(&rf->trunk->deltalist);
-	stream_printf(dest, "head%s%s;\n", head_space, d->revnum);
+	if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0)
+		return (-1);
 
 	/* Write branch, if we have. */
-	if (rf->branch != NULL)
-		stream_printf(dest, "branch%s%s;\n", branch_space, rf->branch);
+	if (rf->branch != NULL) {
+		if (stream_printf(dest, "branch%s%s;\n", branch_space,
+		    rf->branch) < 0)
+			return (-1);
+	}
 
 	/* Write access. */
-	stream_printf(dest, "access");
+	if (stream_printf(dest, "access") < 0)
+		return (-1);
 #if 0
 	if (!STAILQ_EMPTY(&rf->accesslist)) {
 		/*
@@ -324,32 +329,44 @@
 		 */
 	}
 #endif
-	stream_printf(dest, ";\n");
+	if (stream_printf(dest, ";\n") < 0)
+		return (-1);
 
 	/* Write out taglist. */
-	stream_printf(dest, "symbols");
+	if (stream_printf(dest, "symbols") < 0)
+		return (-1);
 	if (!STAILQ_EMPTY(&rf->taglist)) {
 		STAILQ_FOREACH(t, &rf->taglist, tag_next) {
-			stream_printf(dest, "\n%s%s:%s", tag_space, t->tag,
-			    t->revnum);
+			if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag,
+			    t->revnum) < 0)
+				return (-1);
 		}
 	}
-	stream_printf(dest, ";\n");
 
 	/* Write out locks and strict. */
-	stream_printf(dest, "locks;");
-	if (rf->strictlock)
-		stream_printf(dest, " strict;");
-	stream_printf(dest, "\n");
+	if (stream_printf(dest, ";\nlocks;") < 0)
+		return (-1);
+	if (rf->strictlock) {
+		if (stream_printf(dest, " strict;") < 0)
+			return (-1);
+	}
+	if (stream_printf(dest, "\n") < 0)
+		return (-1);
 
 	/* Write out the comment. */
-	if (rf->comment != NULL)
-		stream_printf(dest, "comment%s%s;\n", comment_space, rf->comment);
-	if (rf->expand != EXPAND_DEFAULT)
-		stream_printf(dest, "expand%s@%s@;\n", expand_space,
-		    keyword_encode_expand(rf->expand));
+	if (rf->comment != NULL) {
+		if (stream_printf(dest, "comment%s%s;\n", comment_space,
+		    rf->comment) < 0)
+			return (-1);
+	}
+	if (rf->expand != EXPAND_DEFAULT) {
+		if (stream_printf(dest, "expand%s@%s@;\n", expand_space,
+		    keyword_encode_expand(rf->expand)) < 0)
+			return (-1);
+	}
 
-	stream_printf(dest, "\n\n");
+	if (stream_printf(dest, "\n\n") < 0)
+		return (-1);
 
 	/*
 	 * Write out deltas. We use a stack where we push the appropriate deltas
@@ -364,14 +381,18 @@
 		/* Do not write out placeholders just to be safe. */
 		if (d->placeholder)
 			continue;
-		stream_printf(dest, "%s\n", d->revnum);
-		stream_printf(dest, "date%s%s;%sauthor %s;%sstate",
+		if (stream_printf(dest, "%s\n", d->revnum) < 0)
+			return (-1);
+		if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate",
 		    date_space, d->revdate, auth_space, d->author,
-		    state_space);
-		if (d->state != NULL)
-			stream_printf(dest, " %s", d->state);
-		stream_printf(dest, ";\n");
-		stream_printf(dest, "branches");
+		    state_space) < 0)
+			return (-1);
+		if (d->state != NULL) {
+			if (stream_printf(dest, " %s", d->state) < 0)
+				return (-1);
+		}
+		if (stream_printf(dest, ";\nbranches") < 0)
+			return (-1);
 		/*
 		 * Write out our branches. Add them to a reversed list for use
 		 * later when we write out the text.
@@ -385,30 +406,36 @@
 
 		/* Push branch heads on stack. */
 		STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) {
-			if (d_tmp == NULL)
-				err(1, "empty branch!");
-			stream_printf(dest, "\n%s%s", branches_space,
-			    d_tmp->revnum);
+			if (d_tmp == NULL) {
+				lprintf(2, "Empty branch!\n");
+				return (-1);
+			}
+			if (stream_printf(dest, "\n%s%s", branches_space,
+			    d_tmp->revnum) < 0)
+				return (-1);
 		}
-		stream_printf(dest, ";\n");
 
-		stream_printf(dest, "next%s", next_space);
+		if (stream_printf(dest, ";\nnext%s", next_space) < 0)
+			return (-1);
 		/* Push next delta on stack. */
 		d_next = LIST_NEXT(d, delta_next);
 		if (d_next != NULL) {
-			stream_printf(dest, "%s", d_next->revnum);
+			if (stream_printf(dest, "%s", d_next->revnum) < 0)
+				return (-1);
 			STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next);
 		}
-		stream_printf(dest, ";\n\n");
+		if (stream_printf(dest, ";\n\n") < 0)
+			return (-1);
 	}
-	stream_printf(dest, "\n");
 	/* Write out desc. */
-	stream_printf(dest, "desc\n@@");
+	if (stream_printf(dest, "\ndesc\n@@") < 0)
+		return (-1);
 	d = LIST_FIRST(&rf->trunk->deltalist);
 
 	/* Write out deltatexts. */
 	error = rcsfile_write_deltatext(rf, dest);
-	stream_printf(dest, "\n");
+	if (stream_printf(dest, "\n") < 0)
+		return (-1);
 	return (error);
 }
 
@@ -438,21 +465,25 @@
 		/* Do not write out placeholders just to be safe. */
 		if (d->placeholder)
 			return (0);
-		stream_printf(dest, "\n\n\n%s\n", d->revnum);
-		stream_printf(dest, "log\n@");
+		if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0)
+			return (-1);
+		if (stream_printf(dest, "log\n@") < 0)
+			return (-1);
 		in = stream_open_buf(d->log);
 		line = stream_getln(in, &size);
 		while (line != NULL) {
-			stream_write(dest, line, size);
+			if (stream_write(dest, line, size) == -1)
+				return (-1);
 			line = stream_getln(in, &size);
 		}
 		stream_close(in);
-		stream_printf(dest, "@\n");
-		stream_printf(dest, "text\n@");
+		if (stream_printf(dest, "@\ntext\n@") < 0)
+			return (-1);
 		error = rcsfile_puttext(rf, dest, d, d->prev);
 		if (error)
 			return (error);
-		stream_printf(dest, "@");
+		if (stream_printf(dest, "@") < 0)
+			return (-1);
 	
 		LIST_INIT(&branchlist_datesorted);
 		d_next = LIST_NEXT(d, delta_next);
@@ -535,7 +566,10 @@
 		in = stream_open_buf(d->text);
 		line = stream_getln(in, &size);
 		while (line != NULL) {
-			stream_write(dest, line, size);
+			if (stream_write(dest, line, size) == -1) {
+				error = -1;
+				goto cleanup;
+			}
 			line = stream_getln(in, &size);
 		}
 		stream_close(in);
@@ -549,7 +583,10 @@
 		}
 		line = stream_getln(orig, &size);
 		while (line != NULL) {
-			stream_write(dest, line, size);
+			if (stream_write(dest, line, size) == -1) {
+				error = -1;
+				goto cleanup;
+			}
 			line = stream_getln(orig, &size);
 		}
 		stream_close(orig);
@@ -1261,6 +1298,7 @@
 rcsdelta_addlog(struct delta *d, char *log, int len)
 {
 	struct stream *dest;
+	int nbytes;
 
 	assert(d != NULL);
 	/* Strip away '@' at beginning and end. */
@@ -1268,9 +1306,9 @@
 	len--;
 	log[len - 1] = '\0';
 	dest = stream_open_buf(d->log);
-	stream_write(dest, log, len - 1);
+	nbytes = stream_write(dest, log, len - 1);
 	stream_close(dest);
-	return (0);
+	return ((nbytes == -1) ? -1 : 0);
 }
 
 /* Add deltatext to a delta. Assume the delta already exists. */
@@ -1278,6 +1316,7 @@
 rcsdelta_addtext(struct delta *d, char *text, int len)
 {
 	struct stream *dest;
+	int nbytes;
 
 	assert(d != NULL);
 	/* Strip away '@' at beginning and end. */
@@ -1286,36 +1325,40 @@
 	text[len - 1] = '\0';
 
 	dest = stream_open_buf(d->text);
-	stream_write(dest, text, len - 1);
+	nbytes = stream_write(dest, text, len - 1);
 	stream_close(dest);
-	return (0);
+	return ((nbytes == -1) ? -1 : 0);
 }
 
 /* Add a deltatext logline to a delta. */
-void
+int
 rcsdelta_appendlog(struct delta *d, char *logline, size_t size)
 {
 	struct stream *dest;
+	int error;
 
 	assert(d != NULL);
 	dest = stream_open_buf(d->log);
-	rcsdelta_writestring(logline, size, dest);
+	error = rcsdelta_writestring(logline, size, dest);
 	stream_close(dest);
+	return (error);
 }
 
 /* Add a deltatext textline to a delta. */
-void
+int
 rcsdelta_appendtext(struct delta *d, char *textline, size_t size)
 {
 	struct stream *dest;
+	int error;
 
 	assert(d != NULL);
 	dest = stream_open_buf(d->text);
-	rcsdelta_writestring(textline, size, dest);
+	error = rcsdelta_writestring(textline, size, dest);
 	stream_close(dest);
+	return (error);
 }
 
-static void
+static int 
 rcsdelta_writestring(char *textline, size_t size, struct stream *dest)
 {
 	char buf[3];
@@ -1332,8 +1375,10 @@
 			buf[2] = '\0';
 			count = 2;
 		}
-		stream_write(dest, buf, count);
+		if (stream_write(dest, buf, count) == -1)
+			return (-1);
 	}
+	return (0);
 }
 
 /* Set delta state. */

==== //depot/projects/ppc-g5/contrib/csup/rcsfile.h#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/contrib/csup/rcsfile.h,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.2 2009/03/25 20:15:48 lulf Exp $
  */
 
 #ifndef _RCSFILE_H_
@@ -65,8 +65,8 @@
 
 int		 rcsdelta_addlog(struct delta *, char *, int);
 int		 rcsdelta_addtext(struct delta *, char *, int);
-void		 rcsdelta_appendlog(struct delta *, char *, size_t);
-void		 rcsdelta_appendtext(struct delta *, char *, size_t);
+int		 rcsdelta_appendlog(struct delta *, char *, size_t);
+int		 rcsdelta_appendtext(struct delta *, char *, size_t);
 void		 rcsdelta_setstate(struct delta *, char *);
 void		 rcsdelta_truncatetext(struct delta *, off_t);
 void		 rcsdelta_truncatelog(struct delta *, off_t);

==== //depot/projects/ppc-g5/contrib/csup/rcsparse.c#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/contrib/csup/rcsparse.c,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.2 2009/03/25 20:15:48 lulf Exp $
  */
 
 #include <assert.h>
@@ -309,7 +309,7 @@
 	error = 0;
 	/* In case we don't have deltatexts. */
 	if (token != NUM)
-		return (token);
+		return (-1);
 	do {
 		/* num */
 		assert(token == NUM);

==== //depot/projects/ppc-g5/contrib/csup/updater.c#5 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/updater.c,v 1.4 2009/03/06 20:17:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/updater.c,v 1.6 2009/03/25 20:15:48 lulf Exp $
  */
 
 #include <sys/types.h>
@@ -1385,8 +1385,11 @@
 	do {
 		nread = stream_read(up->rd, buf, (BUFSIZE > remains ?
 		    remains : BUFSIZE));
+		if (nread == -1)
+			return (UPDATER_ERR_PROTO);
 		remains -= nread;
-		stream_write(to, buf, nread);
+		if (stream_write(to, buf, nread) == -1)
+			goto bad;
 	} while (remains > 0);
 	stream_close(to);
 	line = stream_getln(up->rd, NULL);
@@ -1411,9 +1414,11 @@
 	    FA_MODTIME | FA_MASK);
 	error = updater_updatefile(up, fup, md5, isfixup);
 	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-	if (error)
-		return (error);
-	return (0);
+	return (error);
+bad:
+	xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+	    strerror(errno));
+	return (UPDATER_ERR_MSG);
 }
 
 static int
@@ -1469,7 +1474,9 @@
 			if (nbytes == -1)
 				goto bad;
 		}
-		stream_write(to, line, size);
+		nbytes = stream_write(to, line, size);
+		if (nbytes == -1)
+			goto bad;
 		line = stream_getln(up->rd, &size);
 		first = 0;
 	}
@@ -1661,6 +1668,7 @@
 		else
 			lprintf(1, " Touch %s", fup->coname);
 		/* Install new attributes. */
+		fattr_umask(sr->sr_serverattr, coll->co_umask);
 		fattr_install(sr->sr_serverattr, fup->destpath, NULL);
 		if (fup->attic)
 			lprintf(1, " -> Attic");
@@ -1681,8 +1689,11 @@
 	error = rcsfile_write(rf, dest);
 	stream_close(dest);
 	rcsfile_free(rf);
-	if (error)
-		lprintf(-1, "Error writing %s\n", name);
+	if (error) {
+		xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+		    strerror(errno));
+		return (UPDATER_ERR_MSG);
+	}
 
 finish:
 	sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW);
@@ -1767,7 +1778,9 @@
 						size--;
 						logline++;
 					}
-					rcsdelta_appendlog(d, logline, size);
+					if (rcsdelta_appendlog(d, logline, size)
+					    < 0)
+						return (-1);
 					logline = stream_getln(rd, &size);
 				}
 			break;
@@ -1798,7 +1811,9 @@
 						size--;
 						textline++;
 					}
-					rcsdelta_appendtext(d, textline, size);
+					if (rcsdelta_appendtext(d, textline,
+					    size) < 0)
+						return (-1);
 					textline = stream_getln(rd, &size);
 				}
 			break;
@@ -1838,8 +1853,15 @@
 
 	stream_filter_start(to, STREAM_FILTER_MD5, md5);
 	/* First write the existing content. */
-	while ((nread = read(fd, buf, BUFSIZE)) > 0)
-		stream_write(to, buf, nread);
+	while ((nread = read(fd, buf, BUFSIZE)) > 0) {
+		if (stream_write(to, buf, nread) == -1)
+			goto bad;
+	}
+	if (nread == -1) {
+		xasprintf(&up->errmsg, "%s: Error reading: %s",
+		    strerror(errno));
+		return (UPDATER_ERR_MSG);
+	}
 	close(fd);
 
 	bytes = fattr_filesize(fa) - pos;
@@ -1847,8 +1869,11 @@
 	do {
 		nread = stream_read(up->rd, buf,
 		    (BUFSIZE > bytes) ? bytes : BUFSIZE);
+		if (nread == -1)
+			return (UPDATER_ERR_PROTO);
 		bytes -= nread;
-		stream_write(to, buf, nread);
+		if (stream_write(to, buf, nread) == -1)
+			goto bad;
 	} while (bytes > 0);
 	stream_close(to);
 
@@ -1874,9 +1899,11 @@
 	    FA_MODTIME | FA_MASK);
 	error = updater_updatefile(up, fup, md5, 0);
 	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-	if (error)
-		return (error);
-	return (0);
+	return (error);
+bad:
+	xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+	    strerror(errno));
+	return (UPDATER_ERR_MSG);
 }
 
 /*

==== //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 (text+ko) ====

@@ -19,7 +19,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.16 2009/03/14 19:36:13 das Exp $ */
+/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.17 2009/03/25 05:10:32 das Exp $ */
 /* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
 /* Fixed problems with compiling inline-25.c and inline-26.c */
 /* XXX still fails inline-29.c, inline-31.c, and inline-32.c */
@@ -798,7 +798,9 @@
 	      && DECL_ABSTRACT_ORIGIN (p) != p)
 	    TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1;
 	  if (!DECL_EXTERNAL (p)
-	      && DECL_INITIAL (p) == 0)
+	      && DECL_INITIAL (p) == 0
+	      && scope != file_scope
+	      && scope != external_scope)
 	    {
 	      error ("nested function %q+D declared but never defined", p);
 	      undef_nested_function = true;

==== //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.15 2009/03/21 22:58:08 rpaulo Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.17 2009/04/02 13:04:17 rpaulo Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL)

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

From owner-p4-projects@FreeBSD.ORG  Sat Apr  4 17:18:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C292106567A; Sat,  4 Apr 2009 17:18:15 +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 4534B1065678
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 17:18:15 +0000 (UTC)
	(envelope-from xcllnt@mac.com)
Received: from asmtpout015.mac.com (asmtpout015.mac.com [17.148.16.90])
	by mx1.freebsd.org (Postfix) with ESMTP id 321FE8FC22
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 17:18:15 +0000 (UTC)
	(envelope-from xcllnt@mac.com)
MIME-version: 1.0
Content-transfer-encoding: 7BIT
Content-type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Received: from MacBook-Pro.lan.xcllnt.net (mail.xcllnt.net [75.101.29.67])
	by asmtp015.mac.com
	(Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008;
	32bit)) with ESMTPSA id <0KHL00KWB3YDJJ50@asmtp015.mac.com>; Sat,
	04 Apr 2009 09:18:15 -0700 (PDT)
Message-id: <9382F949-1321-40F7-87E5-79C5ED210EE9@mac.com>
From: Marcel Moolenaar <xcllnt@mac.com>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
In-reply-to: <200904041442.n34Eg23Z070834@repoman.freebsd.org>
Date: Sat, 04 Apr 2009 09:18:13 -0700
References: <200904041442.n34Eg23Z070834@repoman.freebsd.org>
X-Mailer: Apple Mail (2.930.3)
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 160201 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: Sat, 04 Apr 2009 17:18:17 -0000


On Apr 4, 2009, at 7:42 AM, Nathan Whitehorn wrote:

> http://perforce.freebsd.org/chv.cgi?CH=160201
>
> Change 160201 by nwhitehorn@nwhitehorn_comporellon on 2009/04/04  
> 14:41:42
>
> 	IFC after integration of 64-bit bridge code to HEAD.

BTW: Great work!

Sorry for not testing Book-E on the branch: my machine isn't well :-/

-- 
Marcel Moolenaar
xcllnt@mac.com




From owner-p4-projects@FreeBSD.ORG  Sat Apr  4 20:44:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D701F1065672; Sat,  4 Apr 2009 20:44: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 8FB3B106564A
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 20:44:17 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D22E8FC15
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 20:44:17 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n34KiHSj015986
	for <perforce@freebsd.org>; Sat, 4 Apr 2009 20:44:17 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n34KiHsk015984
	for perforce@freebsd.org; Sat, 4 Apr 2009 20:44:17 GMT
	(envelope-from csjp@freebsd.org)
Date: Sat, 4 Apr 2009 20:44:17 GMT
Message-Id: <200904042044.n34KiHsk015984@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160213 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: Sat, 04 Apr 2009 20:44:19 -0000

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

Change 160213 by csjp@hvm02 on 2009/04/04 20:43:34

	- Fix code example in man page
	- make it clear we are after the audit id

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#38 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#38 (text+ko) ====

@@ -13,6 +13,8 @@
   definitions of constants in audit_fcntl.h.
 - A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens
   generated by audit_submit(3) were improperly encoded has been fixed.
+- Fix example in audit_submit(3) man page.  Also, make it clear that we want
+  the audit ID as the argument.
 
 OpenBSM 1.1 beta 1
 
@@ -445,4 +447,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#37 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#38 $

==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#15 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 $
 .\"
 .Dd January 18, 2008
 .Dt audit_submit 3
@@ -101,9 +101,12 @@
 int
 audit_bad_su(char *from_login, char *to_login)
 {
+	struct auditinfo_addr aia;
 	int error;
 
-	error = audit_submit(AUE_su, getuid(), 1, EPERM,
+	if (getaudit_addr(&aia, sizeof(aia) < 0)
+		err(1, "getaudit_addr");
+	error = audit_submit(AUE_su, aia.ai_auid, EPERM, 1,
 	    "bad su from %s to %s", from_login, to_login);
 	return (error);
 }

From owner-p4-projects@FreeBSD.ORG  Sat Apr  4 21:22:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 484A71065673; Sat,  4 Apr 2009 21:22:57 +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 F413D106564A
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 21:22:56 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E111B8FC0A
	for <perforce@freebsd.org>; Sat,  4 Apr 2009 21:22:56 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n34LMuSN029650
	for <perforce@freebsd.org>; Sat, 4 Apr 2009 21:22:56 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n34LMuc6029648
	for perforce@freebsd.org; Sat, 4 Apr 2009 21:22:56 GMT
	(envelope-from csjp@freebsd.org)
Date: Sat, 4 Apr 2009 21:22:56 GMT
Message-Id: <200904042122.n34LMuc6029648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160214 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: Sat, 04 Apr 2009 21:22:58 -0000

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

Change 160214 by csjp@hvm02 on 2009/04/04 21:22:55

	Further refine example:
	
	- Make the example return void and in the case of failure, exit.
	  This should re-enforce to users that audit errors should be fatal.
	- Add a return value section
	- Show users how to handle ENOSYS on older kernels

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#16 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 $
 .\"
 .Dd January 18, 2008
 .Dt audit_submit 3
@@ -98,17 +98,28 @@
 #include <stdarg.h>
 #include <errno.h>
 
-int
+void
 audit_bad_su(char *from_login, char *to_login)
 {
 	struct auditinfo_addr aia;
+	struct auditinfo ai;
+	au_id_t aid;
 	int error;
 
-	if (getaudit_addr(&aia, sizeof(aia) < 0)
+	error = getaudit_addr(&aia, sizeof(aia));
+	if (error < 0 && errno == ENOSYS) {
+		error = getaudit(&ai);
+		if (error < 0)
+			err(1, "getaudit");
+		aid = ai.ai_auid;
+	} else if (error < 0)
 		err(1, "getaudit_addr");
-	error = audit_submit(AUE_su, aia.ai_auid, EPERM, 1,
+	else
+		aid = aia.ai_auid;
+	error = audit_submit(AUE_su, aid, EPERM, 1,
 	    "bad su from %s to %s", from_login, to_login);
-	return (error);
+	if (error != 0)
+		err(1, "audit_submit");
 }
 .Ed
 .Pp
@@ -120,6 +131,13 @@
 return,failure : Operation not permitted,1
 trailer,94
 .Ed
+.Sh RETURN VALUES
+If successful,
+.Nm
+will return zero.
+Otherwise a -1 is returned and the global variable
+.Va errno
+is set to indicate the error.
 .Sh SEE ALSO
 .Xr auditon 2 ,
 .Xr getaudit 2 ,