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@xxxxxxxxxxxxxxxx
Attachment:
pgpAIiEIuoi3X.pgp
Description: PGP signature
