diff --git a/[refs] b/[refs]
index a8558e1cdf0b..7d9a3f1469af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a8afc8d3962f3ed26fd6b56db34133860ed1e72
+refs/heads/master: 273ae44b9cb9443e0b5265cdc99f127ddb95c8db
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 106c3ba50844..e9581fd9fb66 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -115,6 +115,7 @@ header-y += mqueue.h
 header-y += mtio.h
 header-y += ncp_no.h
 header-y += neighbour.h
+header-y += net_dropmon.h
 header-y += netfilter_arp.h
 header-y += netrom.h
 header-y += nfs2.h
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index 6b39ede3b1b1..c9fdcd7e71ea 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -222,6 +222,17 @@ config NET_TCPPROBE
 	To compile this code as a module, choose M here: the
 	module will be called tcp_probe.
 
+config NET_DROP_MONITOR
+	boolean "Network packet drop alerting service"
+	depends on INET && EXPERIMENTAL && TRACEPOINTS
+	---help---
+	This feature provides an alerting service to userspace in the
+	event that packets are discarded in the network stack.  Alerts
+	are broadcast via netlink socket to any listening user space
+	process.  If you don't need network drop alerts, or if you are ok
+	just checking the various proc files and other utilities for
+	drop statistics, say N here.
+
 endmenu
 
 endmenu
diff --git a/trunk/net/core/Makefile b/trunk/net/core/Makefile
index d47092bc525c..796f46eece5f 100644
--- a/trunk/net/core/Makefile
+++ b/trunk/net/core/Makefile
@@ -18,4 +18,5 @@ obj-$(CONFIG_NETPOLL) += netpoll.o
 obj-$(CONFIG_NET_DMA) += user_dma.o
 obj-$(CONFIG_FIB_RULES) += fib_rules.o
 obj-$(CONFIG_TRACEPOINTS) += net-traces.o
+obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o