Messages in this thread Patch in this message | | | Date | Wed, 20 Feb 2013 17:02:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the net-next tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 0f6bb6f..3174f19 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c @@ -16,12 +16,11 @@ static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff { struct net *net = seq_file_net(seq); struct net_device *dev; - struct hlist_node *p; struct hlist_head *h; unsigned int count = 0, offset = get_offset(*pos); h = &net->dev_name_head[get_bucket(*pos)]; - hlist_for_each_entry_rcu(dev, p, h, name_hlist) { + hlist_for_each_entry_rcu(dev, h, name_hlist) { if (++count == offset) return dev; }[unhandled content-type:application/pgp-signature] | |