UBUNTU: rebase to v4.10-rc7

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 89830d3cdf945194457da5ef7c92ec597b0cbe9e..1979bb4f6032ba52f28ee96b627e823ec337ed2b 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.10.0-7.9) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
+  [ Upstream Kernel Changes ]
+
+  * rebase to v4.10-rc7
+
  -- Tim Gardner <tim.gardner@canonical.com>  Thu, 02 Feb 2017 10:48:30 -0700
 
 linux (4.10.0-6.8) zesty; urgency=low

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 678c5152e14ade992a62bcb39cca87816dd0554d..675b0c0108b6242d2eb16a356e7cffab00c3f4a7 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7339,6 +7339,8 @@ CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_STATS is not set
+CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK=y