From 888d925fa9554d7422ae3a269db0388095f79ed0 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 16 Jan 2015 03:05:33 +0000 Subject: [PATCH] Update to 3.18.2 svn path=/dists/trunk/linux/; revision=22270 --- debian/changelog | 7 ++++++- ...to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6ccde81c..38f4ad9a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -linux (3.18-1~exp2) UNRELEASED; urgency=medium +linux (3.18.2-1~exp1) UNRELEASED; urgency=medium + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.1 + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.2 + + [ Ian Campbell ] * [armel/kirkwood]: Enable DEBUG_MVEBU_UART_ALTERNATE to match the behaviour of previous boardfile based kirkwood kernels. Otherwise the kernel silently crashes during boot. diff --git a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch index 722981b1d..f0a052f39 100644 --- a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch +++ b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch @@ -89,5 +89,5 @@ Signed-off-by: Serge Hallyn +int unprivileged_userns_clone; + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); - static bool new_idmap_permitted(const struct file *file,