On Friday, April 29, 2011, Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the suspend tree got a conflict in > arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time > compiler for x86-64") from the tree and commit d9f1ce017fcf ("PM: Remove > sysdev suspend, resume and shutdown operations") from the suspend tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Please do, thanks a lot! Rafael -- 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