From owner-cvs-src@FreeBSD.ORG Sat Oct 6 00:46:45 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BCDD16A418 for ; Sat, 6 Oct 2007 00:46:45 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from ch-smtp01.sth.basefarm.net (ch-smtp01.sth.basefarm.net [80.76.149.212]) by mx1.freebsd.org (Postfix) with ESMTP id 1554813C457 for ; Sat, 6 Oct 2007 00:46:45 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from c83-253-31-60.bredband.comhem.se ([83.253.31.60]:53548 helo=falcon.midgard.homeip.net) by ch-smtp01.sth.basefarm.net with esmtp (Exim 4.66) (envelope-from ) id 1IdxoV-00050Q-3X for cvs-src@freebsd.org; Sat, 06 Oct 2007 02:46:39 +0200 Received: (qmail 11996 invoked from network); 6 Oct 2007 02:46:34 +0200 Received: from owl.midgard.homeip.net (10.1.5.7) by falcon.midgard.homeip.net with ESMTP; 6 Oct 2007 02:46:34 +0200 Received: (qmail 25020 invoked by uid 1001); 6 Oct 2007 02:46:34 +0200 Date: Sat, 6 Oct 2007 02:46:34 +0200 From: Erik Trulsson To: Jack Vogel Message-ID: <20071006004634.GA24962@owl.midgard.homeip.net> Mail-Followup-To: Jack Vogel , Jack F Vogel , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org References: <200710052249.l95Mn9Nb071852@repoman.freebsd.org> <20071005231538.GA24016@owl.midgard.homeip.net> <2a41acea0710051705l217224b6vc705dc6139b94e3b@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2a41acea0710051705l217224b6vc705dc6139b94e3b@mail.gmail.com> User-Agent: Mutt/1.5.16 (2007-06-09) X-Originating-IP: 83.253.31.60 X-Scan-Result: No virus found in message 1IdxoV-00050Q-3X. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1IdxoV-00050Q-3X a26161bee83d9e0e95e58e304fc194a4 Cc: Jack F Vogel , cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/conf files kern.pre.mk src/sys/dev/em LICENSE e1000_80003es2lan.c e1000_80003es2lan.h e1000_82540.c e1000_82541.c e1000_82541.h e1000_82542.c e1000_82543.c e1000_82543.h e1000_82571.c e1000_82571.h e1000_82575.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Oct 2007 00:46:45 -0000 On Fri, Oct 05, 2007 at 05:05:05PM -0700, Jack Vogel wrote: > On 10/5/07, Erik Trulsson wrote: > > On Fri, Oct 05, 2007 at 10:49:09PM +0000, Jack F Vogel wrote: > > > jfv 2007-10-05 22:49:09 UTC > > > > > > FreeBSD src repository > > > > > > Modified files: (Branch: RELENG_6) > > > sys/conf files kern.pre.mk > > > sys/dev/em LICENSE if_em.c if_em.h > > > sys/modules/em Makefile > > > Added files: (Branch: RELENG_6) > > > sys/dev/em e1000_80003es2lan.c e1000_80003es2lan.h > > > e1000_82540.c e1000_82541.c e1000_82541.h > > > e1000_82542.c e1000_82543.c e1000_82543.h > > > e1000_82571.c e1000_82571.h e1000_82575.c > > > e1000_82575.h e1000_api.c e1000_api.h > > > e1000_defines.h e1000_hw.h > > > e1000_ich8lan.c e1000_ich8lan.h > > > e1000_mac.c e1000_mac.h e1000_manage.c > > > e1000_manage.h e1000_nvm.c e1000_nvm.h > > > e1000_osdep.h e1000_phy.c e1000_phy.h > > > e1000_regs.h > > > Removed files: (Branch: RELENG_6) > > > sys/dev/em if_em_hw.c if_em_hw.h if_em_osdep.h > > > Log: > > > MFC of Intel driver version 6.6.6 > > > This adds our new modular shared code, support for MSI/MSIX, hardware > > > support for newer adapters, and a variety of bug fixes. > > > > Am I right in thinking that this code is actually newer than the code > > in -CURRENT (which seems to be version 6.5.3) ? If this is indeed the > > case, then shouldn't this code have gone into -CURRENT first? > > Yes, it is newer, the reason for this is the delta between what CURRENT > has and this is small, and I did not want to impact CURRENT while its > frozen getting ready for release. > > That delta between CURRENT and this is also not just some hacking of > mine, its from my Intel release that has gone thru a whole test/validation > and bug fix period of months. > > I would actually have liked to update BOTH CURRENT and STABLE with > this but I was holding off on CURRENT because there are no critical > bug fixes it doesnt have, and its about to be made into a release. As I understand it the policy of FreeBSD is that new stuff *always* should go into -CURRENT first before it is allowed to go into any -STABLE branch. Please see http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/rules.html -- Erik Trulsson ertr1013@student.uu.se