From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: linux-next: build failure after merge of the edac tree Date: Tue, 1 Nov 2011 13:54:54 +0100 Message-ID: <20111101125454.GA21877@aftab> References: <20111101170000.6e7301a30bc21e917631eb88@canb.auug.org.au> <4EAFDECA.3040007@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <4EAFDECA.3040007@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: Mauro Carvalho Chehab Cc: Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" List-Id: linux-next.vger.kernel.org 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