diff --git a/[refs] b/[refs]
index d6968a46c16a..3d5d4bce381d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d640c2286d16b15a21a4475c896cdce6a0bbe0
+refs/heads/master: 507dd7961eed950ef958a9a9536de987c52e81cd
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index cbb505ba9324..a51e33e64552 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -409,6 +409,10 @@ config INET_TCP_DIAG
 	depends on INET_DIAG
 	def_tristate INET_DIAG
 
+config INET_UDP_DIAG
+	depends on INET_DIAG
+	def_tristate INET_DIAG
+
 menuconfig TCP_CONG_ADVANCED
 	bool "TCP: advanced congestion control"
 	---help---
diff --git a/trunk/net/ipv4/Makefile b/trunk/net/ipv4/Makefile
index f2dc69cffb57..e9d98e621112 100644
--- a/trunk/net/ipv4/Makefile
+++ b/trunk/net/ipv4/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_IP_PNP) += ipconfig.o
 obj-$(CONFIG_NETFILTER)	+= netfilter.o netfilter/
 obj-$(CONFIG_INET_DIAG) += inet_diag.o 
 obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o
+obj-$(CONFIG_INET_UDP_DIAG) += udp_diag.o
 obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o
 obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o
 obj-$(CONFIG_TCP_CONG_CUBIC) += tcp_cubic.o