diff --git a/[refs] b/[refs]
index 5730fb222f8b..a1984af3403c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c1014b2bd014c7ec037bbb6f58818162fdb265
+refs/heads/master: 3d36696024499aef19dbf24a781e91a24fbbe4af
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
index 2851d0d15048..63ed69ffad99 100644
--- a/trunk/net/unix/af_unix.c
+++ b/trunk/net/unix/af_unix.c
@@ -2193,7 +2193,11 @@ static void __exit af_unix_exit(void)
 	unregister_pernet_subsys(&unix_net_ops);
 }
 
-module_init(af_unix_init);
+/* Earlier than device_initcall() so that other drivers invoking
+   request_module() don't end up in a loop when modprobe tries
+   to use a UNIX socket. But later than subsys_initcall() because
+   we depend on stuff initialised there */
+fs_initcall(af_unix_init);
 module_exit(af_unix_exit);
 
 MODULE_LICENSE("GPL");