diff mbox

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

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

Commit Message

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

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

Comments

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

Thanks.
Cascardo.
diff mbox

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 18e8e0f..df1233f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8805,7 +8805,9 @@  CONFIG_NFT_REDIR_IPV6                           policy<{'amd64': 'm', 'arm64': '
 # Menu: Networking support >> Networking options >> Network testing
 CONFIG_NET_PKTGEN                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_TCPPROBE                             policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_DROP_MONITOR                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_NET_DROP_MONITOR                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+#
+CONFIG_NET_DROP_MONITOR				note<LP #1660634>
 
 # Menu: Networking support >> Networking options >> QoS and/or fair queueing
 CONFIG_NET_SCHED                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 542a707..dfd97cd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5075,7 +5075,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_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_NET_EMATCH=y