Date: Sun, 30 Aug 1998 11:33:37 +0000 From: Mike Smith <mike@smith.net.au> To: Ollivier Robert <roberto@keltia.freenix.fr> Cc: "FreeBSD Current Users' list" <freebsd-current@FreeBSD.ORG> Subject: Re: CAM & current Message-ID: <199808301133.LAA14708@word.smith.net.au> In-Reply-To: Your message of "Sun, 30 Aug 1998 19:59:25 %2B0200." <19980830195925.A14308@keltia.freenix.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
> While trying to merge CAM & current (with the help of CVS), I tumbled on > this conflict and I don't know how to solve it. Most of the conflicts are > for $Id$ differences but this one in sys/pci/ncr.c is tricky: Don't try to do this. If you want an up-to-date CAM, either wait for a new snapshot, or pester someone with access to the CAM repository to set up a CVSup server. Justin has given this the OK; I haven't been able to do either that or the weekly CAM snapserver I was planning to for various reasons, but it's reasonably straightforward. The CAM integration shouldn't be more than a couple of weeks away, so it's not clear whether this would be worthwhile. -- \\ Sometimes you're ahead, \\ Mike Smith \\ sometimes you're behind. \\ mike@smith.net.au \\ The race is long, and in the \\ msmith@freebsd.org \\ end it's only with yourself. \\ msmith@cdrom.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199808301133.LAA14708>