From 4c6a7e281bb1a55e2322d52437bd7890174828e8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 7 Jan 2012 12:13:06 -0800
Subject: [PATCH] --- yaml --- r: 281961 b: refs/heads/master c:
 6d62a66e4211546f9e5c5d1ad586749a51cf30db h: refs/heads/master i:   281959:
 8d7e6590a93ecd508a831b31a26ea6123ebb6075 v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/Kconfig | 6 +++++-
 trunk/net/unix/Kconfig | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2f812331ef60..5da04fc6c67d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75
+refs/heads/master: 6d62a66e4211546f9e5c5d1ad586749a51cf30db
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index 1a8f93bd2d4f..43e1439e75e6 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -410,8 +410,12 @@ config INET_TCP_DIAG
 	def_tristate INET_DIAG
 
 config INET_UDP_DIAG
+	tristate "UDP: socket monitoring interface"
 	depends on INET_DIAG
-	def_tristate INET_DIAG && IPV6
+	default n
+	---help---
+	  Support for UDP socket monitoring interface used by the ss tool.
+	  If unsure, say Y.
 
 menuconfig TCP_CONG_ADVANCED
 	bool "TCP: advanced congestion control"
diff --git a/trunk/net/unix/Kconfig b/trunk/net/unix/Kconfig
index c2128b10e5f9..8b31ab85d050 100644
--- a/trunk/net/unix/Kconfig
+++ b/trunk/net/unix/Kconfig
@@ -22,7 +22,7 @@ config UNIX
 config UNIX_DIAG
 	tristate "UNIX: socket monitoring interface"
 	depends on UNIX
-	default UNIX
+	default n
 	---help---
 	  Support for UNIX socket monitoring interface used by the ss tool.
 	  If unsure, say Y.