Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/afs/dynroot.c b/fs/afs/dynroot.c
index 1cde710a8013..f29c6dade7f6 100644
--- a/fs/afs/dynroot.c
+++ b/fs/afs/dynroot.c
@@ -265,7 +265,7 @@ int afs_dynroot_populate(struct super_block *sb)
                 return -ERESTARTSYS;
 
         net->dynroot_sb = sb;
-        list_for_each_entry(cell, &net->proc_cells, proc_link) {
+        hlist_for_each_entry(cell, &net->proc_cells, proc_link) {
                 ret = afs_dynroot_mkdir(net, cell);
                 if (ret < 0)
                         goto error;