Hi Mauro,
Today's linux-next merge of the edac tree got a conflict in drivers/edac/edac_mc.c between commit faa2ad09c01c ("edac_mc: edac_mc_free() cannot assume mem_ctl_info is registered in sysfs") from Linus' tree and commit 12c3ab9422cc ("edac: edac_mc_free() cannot assume mem_ctl_info is registered in sysfs") from the edac tree.
Two versions of the same patch. I just used the version from the edac
tree and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpkfaSeVXsaO.pgp
Description: PGP signature
