[PATCH 2/2] UBUNTU: [Config] Dropped CONFIG_TIMER_STATS

[Tim Gardner]

CVE-2017-5967

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

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 68f4c169f538..35aac45aeb3a 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7991,7 +7991,6 @@ CONFIG_DEBUG_SHIRQ                              policy<{'amd64': 'n', 'arm64': '
 CONFIG_SCHED_DEBUG                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SCHEDSTATS                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SCHED_STACK_END_CHECK                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_TIMER_STATS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEBUG_PREEMPT                            policy<{'amd64-lowlatency': 'n', 'i386-lowlatency': 'n'}>
 CONFIG_DEBUG_KOBJECT                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_BUGVERBOSE                         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 18b4e8f2ca1a..2f3c1a09bffa 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7902,7 +7902,6 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_TIFM_7XX1=m
 CONFIG_TIMB_DMA=m
 CONFIG_TIMERFD=y
-CONFIG_TIMER_STATS=y
 CONFIG_TIPC=m
 CONFIG_TIPC_MEDIA_IB=y
 CONFIG_TIPC_MEDIA_UDP=y
-- 
2.17.1