From owner-freebsd-smp Wed Nov 20 20:53:54 1996 Return-Path: owner-smp Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id UAA05009 for smp-outgoing; Wed, 20 Nov 1996 20:53:54 -0800 (PST) Received: from clem.systemsix.com (clem.systemsix.com [198.99.86.131]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id UAA04996; Wed, 20 Nov 1996 20:53:33 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by clem.systemsix.com (8.6.12/8.6.12) with SMTP id VAA29522; Wed, 20 Nov 1996 21:53:28 -0700 Message-Id: <199611210453.VAA29522@clem.systemsix.com> X-Authentication-Warning: clem.systemsix.com: Host localhost didn't use HELO protocol X-Mailer: exmh version 1.6.5 12/11/95 From: Steve Passe To: Peter Wemm cc: freebsd-smp@freefall.freebsd.org Subject: Re: cvs commit: sys/i386/boot/biosboot asm.h sys/net rtsock.c sys/sys kernel.h proc.h sys/ufs/ufs ufs_inode.c sys/ddb db_trap.c sys/i386/i386 autoconf.c machdep.c pmap.c support.s sys/i386/include ipl.h pcb.h segments.h sys/i386/isa icu.h icu.s if_ed.c if_ze.c isa_device.h npx.c pcibus.c sio.c sys/kern init_main.c subr_prf.c sys/pci pci.c pcibus.h sys/scsi scsi_ioctl.c sd.c In-reply-to: Your message of "Wed, 20 Nov 1996 20:16:07 PST." <199611210416.UAA03553@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 20 Nov 1996 21:53:28 -0700 Sender: owner-smp@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Hi, > It compiles now, but icu.s and vector.s has some unresolved merge problems. > (ie: there have been changes in -current which are applicable to all three > (or four?) sets of duplicated INTR macros, but the merge only did one of > them, and probably the wrong one. Steve needs to look more closely at > the effects of this) I'm on it... -- Steve Passe | powered by smp@csn.net | FreeBSD