* linux-next: manual merge of the edac tree with the trivial tree
@ 2012-05-18 6:02 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-05-18 6:02 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, David Mackey, Vinson Lee, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the edac tree with the trivial tree
@ 2012-05-18 6:06 Stephen Rothwell
2012-05-22 8:55 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-05-18 6:06 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Jiri Kosina, David Mackey
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the edac tree with the trivial tree
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
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Kosina @ 2012-05-22 8:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, David Mackey,
Vinson Lee
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.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the edac tree with the trivial tree
2012-05-22 8:55 ` Jiri Kosina
@ 2012-05-22 10:29 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2012-05-22 10:29 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel, David Mackey,
Vinson Lee
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-22 10:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2012-05-18 6:02 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).