All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Borislav Petkov <bp@amd64.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the edac tree
Date: Tue, 01 Nov 2011 11:00:34 -0200	[thread overview]
Message-ID: <4EAFED72.8000107@redhat.com> (raw)
In-Reply-To: <20111101125454.GA21877@aftab>

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.
> 

  reply	other threads:[~2011-11-01 13:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-01  6:00 linux-next: build failure after merge of the edac tree Stephen Rothwell
2011-11-01 11:58 ` Mauro Carvalho Chehab
2011-11-01 12:54   ` Borislav Petkov
2011-11-01 13:00     ` Mauro Carvalho Chehab [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-27  2:43 Stephen Rothwell
2024-03-08 22:43 ` Yazen Ghannam
2024-03-09  9:46   ` Borislav Petkov
2024-03-11 13:06     ` Yazen Ghannam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4EAFED72.8000107@redhat.com \
    --to=mchehab@redhat.com \
    --cc=bp@amd64.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.