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

[John Baldwin]

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 at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/