Date: Thu, 01 May 2003 14:54:01 -0400 (EDT) From: John Baldwin <jhb@FreeBSD.org> To: Nate Lawson <njl@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 Message-ID: <XFMail.20030501145401.jhb@FreeBSD.org> In-Reply-To: <200304291911.h3TJB0E2076851@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20030501145401.jhb>