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

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Tim Gardner-2
BugLink: http://bugs.launchpad.net/bugs/1660634

Signed-off-by: Tim Gardner <[hidden email]>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH Trusty SRU] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m

Seth Forshee
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH Trusty SRU] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m

Marcelo Henrique Cerri
In reply to this post by Tim Gardner-2
--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (484 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

APPLIED: [PATCH Trusty SRU] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m

Thadeu Lima de Souza Cascardo-3
In reply to this post by Tim Gardner-2
Applied to trusty master-next branch.

Thanks.
Cascardo.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team