Messages in this thread | | | Date | Tue, 1 Nov 2011 13:54:54 +0100 | From | Borislav Petkov <> | Subject | Re: linux-next: build failure after merge of the edac tree |
| |
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?
Thanks.
-- Regards/Gruss, Boris.
Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach GM: Alberto Bozzo Reg: Dornach, Landkreis Muenchen HRB Nr. 43632 WEEE Registernr: 129 19551
| |