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

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

Change 61914 by peter@peter_melody on 2004/09/22 00:16:52

	Integ -I -b i386_hammer - mostly a metadata sync-up but pick up
	GENERIC ispfw change.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#107 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#57 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#22 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#107 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/GENERIC#57 (text+ko) ====

@@ -98,6 +98,7 @@
 device		ahd		# AHA39320/29320 and onboard AIC79xx devices
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
+#device 	ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')