From owner-cvs-all@FreeBSD.ORG Sat Oct 6 00:33:10 2007 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 278FE16A418 for ; Sat, 6 Oct 2007 00:33:10 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.191]) by mx1.freebsd.org (Postfix) with ESMTP id 9E09513C4B3 for ; Sat, 6 Oct 2007 00:33:09 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so766933mue for ; Fri, 05 Oct 2007 17:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=g36qp+6s2kH3XSNm9DGkgPlVT5ohERyZC4TybG4HzwY=; b=pMDk1+0CNYZREgWdPZOSILgsGjjT1rV8GgQJOq/pw0NxYCPt1iUIoH1oNoq2lCp7Un1BoVOCTUL9jYOvmhZR6cODzp7mJ6eaCcCGX0XLagnDy3oVniVK48pEZu5e1CI78pI5Mqt83JSiBp7BuxvhS+Pyx15ecMOIGGvL9ipvKuI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=lFdOTY9geTO+4UQQULEwH6jcWn03XSvaQ8OXnpXPIgnbeCrARBm0NeBTwk+kAHunjJGC16ysRfkBdMtbofVy8VOnie86qMBDtavsQEy6tTMPi7xHcsbIaeFfgUWAPTTB36n80yAZOILXtll7g6s3J1rEsD2EGK8kwT6etfbepww= Received: by 10.86.98.18 with SMTP id v18mr2879911fgb.1191629105108; Fri, 05 Oct 2007 17:05:05 -0700 (PDT) Received: by 10.86.100.19 with HTTP; Fri, 5 Oct 2007 17:05:05 -0700 (PDT) Message-ID: <2a41acea0710051705l217224b6vc705dc6139b94e3b@mail.gmail.com> Date: Fri, 5 Oct 2007 17:05:05 -0700 From: "Jack Vogel" To: "Jack F Vogel" , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org In-Reply-To: <20071005231538.GA24016@owl.midgard.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200710052249.l95Mn9Nb071852@repoman.freebsd.org> <20071005231538.GA24016@owl.midgard.homeip.net> Cc: 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Oct 2007 00:33:10 -0000 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. Cheers, Jack