From owner-cvs-all@FreeBSD.ORG Mon Aug 7 12:15:35 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5637816A4E2; Mon, 7 Aug 2006 12:15:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (cell.sick.ru [217.72.144.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id A418143D49; Mon, 7 Aug 2006 12:15:34 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from cell.sick.ru (glebius@localhost [127.0.0.1]) by cell.sick.ru (8.13.4/8.13.3) with ESMTP id k77CFWMS054098 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 7 Aug 2006 16:15:32 +0400 (MSD) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.sick.ru (8.13.4/8.13.1/Submit) id k77CFW6u054097; Mon, 7 Aug 2006 16:15:32 +0400 (MSD) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.sick.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Mon, 7 Aug 2006 16:15:32 +0400 From: Gleb Smirnoff To: Prafulla Deuskar Message-ID: <20060807121532.GE96644@FreeBSD.org> References: <200608031905.k73J55D2061870@repoman.freebsd.org> <20060804095414.GU96644@FreeBSD.org> <20060804143825.GA8797@hub.freebsd.org> <20060804151422.GE96644@FreeBSD.org> <20060804162149.GB22299@hub.freebsd.org> <20060807114556.GC96644@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <20060807114556.GC96644@FreeBSD.org> User-Agent: Mutt/1.5.6i Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/em if_em.c if_em.h 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: Mon, 07 Aug 2006 12:15:35 -0000 On Mon, Aug 07, 2006 at 03:45:56PM +0400, Gleb Smirnoff wrote: T> On Fri, Aug 04, 2006 at 04:21:49PM +0000, Prafulla Deuskar wrote: T> P> > Thanks. Any objections about merging the HEAD to RELENG_6 soon? T> P> T> P> Jack Vogel is doing the merge - I will send it out to you for review. T> P> So let us plan on committing early next week? T> T> The merge is very simple: T> T> 1) take the driver from HEAD T> 2) rename VLAN_INPUT_TAG() macro to VLAN_INPUT_TAG_NEW() T> 3) revert revision 1.105, since this functionality isn't yet in RELENG_6 T> T> I have prepared the patch last week and posted it on STABLE, and several T> people have already reported that they successfully run it. So, we can T> commit to RELENG_6, I think. I have updated the patch at http://people.freebsd.org/~glebius/em-6.0.5.RELENG_6.patch.gz to include your latest commit. -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE