Re: linux-next: manual merge of the akpm tree with the net-next tree

From: Cong Wang
Date: Wed Feb 20 2013 - 01:43:19 EST

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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at