From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: build failure after merge of the edac tree Date: Tue, 01 Nov 2011 11:00:34 -0200 Message-ID: <4EAFED72.8000107@redhat.com> References: <20111101170000.6e7301a30bc21e917631eb88@canb.auug.org.au> <4EAFDECA.3040007@redhat.com> <20111101125454.GA21877@aftab> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:37461 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534Ab1KANA5 (ORCPT ); Tue, 1 Nov 2011 09:00:57 -0400 In-Reply-To: <20111101125454.GA21877@aftab> Sender: linux-next-owner@vger.kernel.org List-ID: To: Borislav Petkov Cc: Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" 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. >