From owner-svn-src-all@FreeBSD.ORG Tue Jun 22 08:14:10 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D81E1065672; Tue, 22 Jun 2010 08:14:10 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id F17188FC23; Tue, 22 Jun 2010 08:14:08 +0000 (UTC) Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA15216; Tue, 22 Jun 2010 11:14:06 +0300 (EEST) (envelope-from avg@freebsd.org) Received: from localhost.topspin.kiev.ua ([127.0.0.1]) by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1OQycQ-000PYE-Fj; Tue, 22 Jun 2010 11:14:06 +0300 Message-ID: <4C2070CC.6090005@freebsd.org> Date: Tue, 22 Jun 2010 11:14:04 +0300 From: Andriy Gapon User-Agent: Thunderbird 2.0.0.24 (X11/20100603) MIME-Version: 1.0 To: Jack F Vogel References: <201006181636.o5IGavsD011902@svn.freebsd.org> In-Reply-To: <201006181636.o5IGavsD011902@svn.freebsd.org> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r209308 - stable/8/sys/dev/ixgbe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 08:14:10 -0000 on 18/06/2010 19:36 Jack F Vogel said the following: > Author: jfv > Date: Fri Jun 18 16:36:57 2010 > New Revision: 209308 > URL: http://svn.freebsd.org/changeset/base/209308 > > Log: > MFC of ixgbe driver version 2.2.1 > -mostly stability fixes > > MFC to RELENG 8.1 asap > > Modified: > stable/8/sys/dev/ixgbe/ixgbe.c > stable/8/sys/dev/ixgbe/ixgbe.h > Directory Properties: > stable/8/sys/dev/ixgbe/ (props changed) Looks like this svn merge was done on sys/dev/ixgbe directory. It should have been done on sys/. This pollutes repository, You also haven't mentioned head revisions being MFC-ed. This makes life harder for others. Just in case: http://wiki.freebsd.org/SubversionPrimer/Merging -- Andriy Gapon