From owner-svn-src-all@FreeBSD.ORG Tue May 22 00:08:50 2012 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 1B1F51065678; Tue, 22 May 2012 00:08:50 +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 E06C48FC25; Tue, 22 May 2012 00:08:49 +0000 (UTC) Received: from John-Baldwins-MacBook-Air.local (c-68-39-198-164.hsd1.de.comcast.net [68.39.198.164]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id DD610B922; Mon, 21 May 2012 20:08:48 -0400 (EDT) Message-ID: <4FBAD919.2010706@FreeBSD.org> Date: Mon, 21 May 2012 20:08:57 -0400 From: John Baldwin User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: John Baldwin References: <201205211958.q4LJweXG070838@svn.freebsd.org> <201205211718.34896.jhb@freebsd.org> In-Reply-To: <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 20:08:49 -0400 (EDT) Cc: svn-src-stable@freebsd.org, Sean Bruno , src-committers@freebsd.org, svn-src-all@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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2012 00:08:50 -0000 On 5/21/12 5:18 PM, John Baldwin wrote: > 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? I think I have this cleaned up. However, I have only tried using a 1.6 client so far (and it was merging things fine before). Sean, I think you are using a 1.7 client, yes? If anyone does a merge and notices that it adds a ton of new mergeinfo, can you please wait to commit until after someone else has looked at it? Hopefully the mergeinfo stuff I adjusted will fix this. (And I'm done with my current guesses at fixing.) -- John Baldwin