Date: Mon, 21 May 2012 20:08:57 -0400 From: John Baldwin <jhb@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-stable@freebsd.org, Sean Bruno <sbruno@freebsd.org>, 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 Message-ID: <4FBAD919.2010706@FreeBSD.org> In-Reply-To: <201205211718.34896.jhb@freebsd.org> References: <201205211958.q4LJweXG070838@svn.freebsd.org> <201205211718.34896.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FBAD919.2010706>