From owner-cvs-src@FreeBSD.ORG Tue Jun 27 06:55:18 2006 Return-Path: X-Original-To: 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 4C66316A407; Tue, 27 Jun 2006 06:55:18 +0000 (UTC) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8585D43D45; Tue, 27 Jun 2006 06:54:59 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.6/8.13.6) with ESMTP id k5R6swC8024807; Mon, 26 Jun 2006 23:54:58 -0700 (PDT) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.6/8.13.1/Submit) id k5R6swel024806; Mon, 26 Jun 2006 23:54:58 -0700 (PDT) (envelope-from obrien) Date: Mon, 26 Jun 2006 23:54:58 -0700 From: "David O'Brien" To: Scott Long Message-ID: <20060627065458.GB24505@dragon.NUXI.org> References: <200606262341.k5QNf7qA048288@repoman.freebsd.org> <44A07A14.7010301@samsco.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <44A07A14.7010301@samsco.org> X-Operating-System: FreeBSD 7.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.11 Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/man/man4 Makefile nfe.4 src/sys/amd64/conf NOTES src/sys/conf files.amd64 files.i386 src/sys/dev/nfe if_nfe.c if_nfereg.h if_nfevar.h src/sys/i386/conf NOTES src/sys/modules Makefile src/sys/modules/nfe Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 06:55:18 -0000 On Mon, Jun 26, 2006 at 06:21:40PM -0600, Scott Long wrote: > David E. O'Brien wrote: > > Log: > > Add a pure open source nForce Ethernet driver, under BSDL. > > This driver was ported from OpenBSD by Shigeaki Tagashira > > and posted at > > http://www.se.hiroshima-u.ac.jp/~shigeaki/software/freebsd-nfe.html > > It was additionally cleaned up by me. > > It is still a work-in-progress and thus is purposefully not in GENERIC. > > And it conflicts with nve(4), so only one should be loaded. > > Does it conflict with symbols, or just with PCI Ids? If it's just the > latter then both can be present in the kernel, but the one with the > higher probe return value will win. Just the PCI ID's. -- -- David (obrien@FreeBSD.org)