diff mbox

[Trusty,SRU] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m

Message ID 1485873910-25188-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner Jan. 31, 2017, 2:45 p.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/1660634

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Seth Forshee Feb. 3, 2017, 2:33 p.m. UTC | #1
Marcelo Henrique Cerri Feb. 7, 2017, 12:04 p.m. UTC | #2
Thadeu Lima de Souza Cascardo Feb. 14, 2017, 10:36 a.m. UTC | #3 
Applied to trusty master-next branch.

Thanks.
Cascardo.
diff mbox

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index d4744fd..469b39f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1778,7 +1778,7 @@  CONFIG_IP_VS_NFCT				y
 # Menu: Networking options >> Network packet filtering framework (Netfilter) >> IPv6: Netfilter Configuration
 
 # Menu: Networking options >> Network testing
-CONFIG_NET_DROP_MONITOR				n
+CONFIG_NET_DROP_MONITOR				m note<LP #1660634>
 
 # Menu: Networking options >> QoS and/or fair queueing
 CONFIG_NET_SCHED				y mark<Subsystem>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 345cd32..0d07fac 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4285,7 +4285,7 @@  CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m
-# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6123_61_65=m