From owner-cvs-src@FreeBSD.ORG  Thu May  1 11:54:01 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 71AA737B405
	for <cvs-src@FreeBSD.org>; Thu,  1 May 2003 11:54:01 -0700 (PDT)
Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 23F5943FB1
	for <cvs-src@FreeBSD.org>; Thu,  1 May 2003 11:53:59 -0700 (PDT)
	(envelope-from jhb@FreeBSD.org)
Received: (qmail 897 invoked from network); 1 May 2003 18:54:05 -0000
Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63])
	(envelope-sender <jhb@FreeBSD.org>)encrypted SMTP
	for <src-committers@FreeBSD.org>; 1 May 2003 18:54:05 -0000
Received: from laptop.baldwin.cx ([216.133.140.1])
	by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h41IruOv026474;
	Thu, 1 May 2003 14:53:56 -0400 (EDT)
	(envelope-from jhb@FreeBSD.org)
Message-ID: <XFMail.20030501145401.jhb@FreeBSD.org>
X-Mailer: XFMail 1.5.4 on FreeBSD
X-Priority: 3 (Normal)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
In-Reply-To: <200304291911.h3TJB0E2076851@repoman.freebsd.org>
Date: Thu, 01 May 2003 14:54:01 -0400 (EDT)
From: John Baldwin <jhb@FreeBSD.org>
To: Nate Lawson <njl@FreeBSD.org>
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: RE: cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h
	acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h dbcmds.c
	dbxface.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c
	tbget.c utglobal.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2003 18:54:01 -0000


On 29-Apr-2003 Nate Lawson wrote:
> njl         2003/04/29 12:11:00 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h 
>                            acpi.h acpiosxf.h acpixf.h acutils.h 
>                            dbcmds.c dbxface.c exfldio.c exsystem.c 
>                            hwsleep.c psparse.c rscreate.c tbget.c 
>                            utglobal.c 
>   Log:
>   Resolve conflicts.
>   
>   Revision  Changes    Path
>   1.5       +122 -66   src/sys/contrib/dev/acpica/dbxface.c

This blew away all our local changes breaking the kernel build.
A simple diff of the previous import and previous head patches
cleanly against 1.5 and gets LINT to build again.  Can you check
to make sure no other local changes were lost?

-- 

John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/