svn commit: r235738 - in stable/9/sys: . dev/mfi

[John Baldwin]

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