From owner-freebsd-current@FreeBSD.ORG Sat May 15 19:48:15 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16BD31065670 for ; Sat, 15 May 2010 19:48:15 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) by mx1.freebsd.org (Postfix) with ESMTP id 74E2F8FC0A for ; Sat, 15 May 2010 19:48:14 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.3/8.14.3/ALCHEMY.FRANKEN.DE) with ESMTP id o4FJmDKo010741; Sat, 15 May 2010 21:48:13 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.3/8.14.3/Submit) id o4FJmCdI010740; Sat, 15 May 2010 21:48:12 +0200 (CEST) (envelope-from marius) Date: Sat, 15 May 2010 21:48:12 +0200 From: Marius Strobl To: Taku YAMAMOTO Message-ID: <20100515194812.GA10554@alchemy.franken.de> References: <20100501171252.e05f257f.taku@tackymt.homeip.net> <20100515222317.2db5bab5.taku@tackymt.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100515222317.2db5bab5.taku@tackymt.homeip.net> User-Agent: Mutt/1.4.2.3i Cc: freebsd-current@freebsd.org, Jack Vogel Subject: Re: Followup: if_em.c prevents the 2nd time resuming X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2010 19:48:15 -0000 On Sat, May 15, 2010 at 10:23:17PM +0900, Taku YAMAMOTO wrote: > PR filed as kern/146614. > http://www.freebsd.org/cgi/query-pr.cgi?pr=146614 > That was an mismerge introduced when moving the original patch forward to a newer version of the e1000 source. It's now fixed. Thanks for reporting. Marius