diff --git a/[refs] b/[refs]
index f4c9815475e1..d626a1900e91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99c7bc0133b875280fdd2bf78e4ffbd58cc609e3
+refs/heads/master: 5991c84421f3ea1e281954610a39e4993e5c39e4
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index b4848ce0d6ac..6d261bf206fc 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -1178,7 +1178,8 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
  */
 
 	if (!(sock = sock_alloc())) {
-		printk(KERN_WARNING "socket: no more sockets\n");
+		if (net_ratelimit())
+			printk(KERN_WARNING "socket: no more sockets\n");
 		err = -ENFILE;		/* Not exactly a match, but its the
 					   closest posix thing */
 		goto out;