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

From: Mauro Carvalho Chehab <[email-masked]>
Date: Tue, 01 Nov 2011 09:58:02 -0200

Em 01-11-2011 04:00, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> After merging the edac tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> arch/x86/kernel/cpu/mcheck/mce.c:39:28: fatal error: linux/edac_mce.h: No such file or directory
> 
> Caused by commit cdaf4f4e563c ("i7core_edac: Drop the edac_mce
> facility").  This commit removed the file include/linux/edac_mce.h which
> is still metioned by the above file (and MAINTAINERS).  Grep is your
> friend.

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.

Thanks,
Mauro.