From owner-p4-projects@FreeBSD.ORG  Mon Nov 17 00:25:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D525116A4D0; Mon, 17 Nov 2003 00:25:47 -0800 (PST)
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 ABB8216A4CE
	for <perforce@freebsd.org>; Mon, 17 Nov 2003 00:25:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A59A043F75
	for <perforce@freebsd.org>; Mon, 17 Nov 2003 00:25:46 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAH8PkXJ084257
	for <perforce@freebsd.org>; Mon, 17 Nov 2003 00:25:46 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH8PkoK084254
	for perforce@freebsd.org; Mon, 17 Nov 2003 00:25:46 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Mon, 17 Nov 2003 00:25:46 -0800 (PST)
Message-Id: <200311170825.hAH8PkoK084254@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 42645 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2003 08:25:48 -0000

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

Change 42645 by peter@peter_overcee on 2003/11/17 00:24:53

	step 1: cross fingers
	step 2: p4 resolve -ay
	step 3: hope the $FreeBSD$ conflicts aren't too painful to fix
	step 4: ...
	step 5: PROFIT!!

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#18 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#14 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#20 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#23 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#6 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#5 integrate
.. //depot/projects/hammer/sys/amd64/include/apicreg.h#6 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#16 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#9 integrate
.. //depot/projects/hammer/sys/amd64/include/mptable.h#6 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#27 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#8 integrate
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#7 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#18 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#8 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#14 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#20 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#23 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#39 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#6 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#15 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#5 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/apicreg.h#6 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/apicvar.h#16 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#9 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/mptable.h#6 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/isa/atpic.c#27 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#8 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/isa/nmi.c#7 (text+ko) ====