On Wed, Dec 28, 2011 at 05:26:11PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/s390/kernel/smp.c between commit 83a24e329084 ("[S390] topology: get > rid of ifdefs") from the s390 tree and commit 8a25a2fd126c ("cpu: convert > 'cpu' and 'machinecheck' sysdev_class to a regular subsystem") from the > driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary. > > I also applied the following merge fix patch (which may not be correct or > enough) for the bits moved into topology.c: Looks good, thanks for doing this. greg k-h -- 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