diff --git a/[refs] b/[refs] index 305e661c873e..dc373fdb7f5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24bb4fb6dac59f220f42fb375ba0e0f19365a227 +refs/heads/master: 6e43650cee644b5d7957ecd50f1e41ff71f87734 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e797c4d48cf1..4c5b920e0725 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3619,6 +3619,13 @@ F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c F: include/linux/nbd.h +NETWORK DROP MONITOR +M: Neil Horman +L: netdev@vger.kernel.org +S: Maintained +W: https://fedorahosted.org/dropwatch/ +F: net/core/drop_monitor.c + NETWORKING [GENERAL] M: "David S. Miller" L: netdev@vger.kernel.org