lkml.org 
[lkml]   [2012]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the edac tree with Linus' tree
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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-24 07:41    [W:0.023 / U:0.868 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site