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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
