From owner-svn-src-all@FreeBSD.ORG  Mon May 21 21:18:38 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 96E4B106566B;
	Mon, 21 May 2012 21:18:38 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6ADCC8FC0A;
	Mon, 21 May 2012 21:18:38 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id D5D29B922;
	Mon, 21 May 2012 17:18:37 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Sean Bruno <sbruno@freebsd.org>
Date: Mon, 21 May 2012 17:18:34 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p13; KDE/4.5.5; amd64; ; )
References: <201205211958.q4LJweXG070838@svn.freebsd.org>
In-Reply-To: <201205211958.q4LJweXG070838@svn.freebsd.org>
MIME-Version: 1.0
Message-Id: <201205211718.34896.jhb@freebsd.org>
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Mon, 21 May 2012 17:18:37 -0400 (EDT)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r235738 - in stable/9/sys: . dev/mfi
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2012 21:18:38 -0000

On Monday, May 21, 2012 3:58:40 pm Sean Bruno wrote:
> Author: sbruno
> Date: Mon May 21 19:58:40 2012
> New Revision: 235738
> URL: http://svn.freebsd.org/changeset/base/235738
> 
> Log:
>   MFC r235634
>   
>   Fix and update battery status bits according to linux driver

Hmm, svn seems to have crapped itself.

We should probably at least remove the unnecessary mergeinfo from files.

Ah, it looks like the MFC of the last round of ixgbe changes was merged into a 
sparse checkout, and that is causing the pain.  I will try to fix this, but 
can other folks hold off on merging to stable/9/sys while I do so?

-- 
John Baldwin