diff --git a/[refs] b/[refs]
index 12042872df6c..193624154819 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f61cd879c2f112c468e8849949b6fc88c739679
+refs/heads/master: 6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index aa2a2c79776f..d183262943d9 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -409,7 +409,7 @@ config INET_TCP_DIAG
 
 config INET_UDP_DIAG
 	tristate "UDP: socket monitoring interface"
-	depends on INET_DIAG
+	depends on INET_DIAG && (IPV6 || IPV6=n)
 	default n
 	---help---
 	  Support for UDP socket monitoring interface used by the ss tool.