Subject: Re: linux-next: build failure after merge of the edac tree

From: Mauro Carvalho Chehab <[email-masked]>
Date: Tue, 01 Nov 2011 11:00:34 -0200

Em 01-11-2011 10:54, Borislav Petkov escreveu:
> On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote:
>> Sorry, it were caused by a bad merge conflict resolution. The include
>> isn't need anymore.
>>
>> The MAINTAINERS fix is indeed needed.
>>
>>> I have used the version of the edac tree from next-20111025 for today.
>>
>> I'm fixing both issues for tomorrow's next.
> 
> Btw, you're sending those to Linus soon, right?

Yes, likely tomorrow, if no surprises at linux-next merge arise.

> Thanks.