Re: linux-next: manual merge of the edac tree with the trivialtree

[Jiri Kosina]

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