On 02/20/2013 02:02 PM, Stephen Rothwell wrote:
Hi Andrew,Today's linux-next merge of the akpm tree got a conflict in net/core/dev.c between commit 900ff8c63214 ("net: move procfs code to net/core/net-procfs.c") from the net-next tree and commit "hlist: drop the node parameter from iterators" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required).
Looks good. Thanks, Stephen! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
