All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	David Mackey <tdmackey@twitter.com>,
	Vinson Lee <vlee@twitter.com>
Subject: Re: linux-next: manual merge of the edac tree with the trivial tree
Date: Tue, 22 May 2012 07:29:45 -0300	[thread overview]
Message-ID: <4FBB6A99.4040503@redhat.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1205221055340.16396@pobox.suse.cz>

Em 22-05-2012 05:55, Jiri Kosina escreveu:
> On Fri, 18 May 2012, Stephen Rothwell wrote:
> 
>> Hi Mauro,
>>
>> Today's linux-next merge of the edac tree got a conflict in
>> drivers/edac/edac_core.h between commit 15ed103a9800 ("edac: Fix spelling
>> errors") from the trivial tree and commit 90b40d5cadba ("edac: Remove the
>> legacy EDAC ABI") from the edac tree.
>>
>> One of the comments fixed by the former is removed by the latter, so I
>> did that.
> 
> On Fri, 18 May 2012, Stephen Rothwell wrote:
> 
>> Hi Mauro,
>>
>> Today's linux-next merge of the edac tree got a conflict in
>> drivers/edac/edac_device.c between commit 15ed103a9800 ("edac: Fix
>> spelling errors") from the trivial tree and commit b9e889c84229 ("edac:
>> rewrite edac_align_ptr()") from the edac tree.
>>
>> One of the comments fixed by the former is removed by the latter, so I
>> did that.
> 
> I have dropped both hunks, so the conflict should be gone. Thanks.

Thanks!
Mauro

  reply	other threads:[~2012-05-22 10:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18  6:06 linux-next: manual merge of the edac tree with the trivial tree Stephen Rothwell
2012-05-22  8:55 ` Jiri Kosina
2012-05-22 10:29   ` Mauro Carvalho Chehab [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-05-18  6:02 Stephen Rothwell

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=4FBB6A99.4040503@redhat.com \
    --to=mchehab@redhat.com \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tdmackey@twitter.com \
    --cc=vlee@twitter.com \
    /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.