[kernel] r22270 - in dists/trunk/linux/debian: . patches/debian

[Ben Hutchings]

Author: benh
Date: Fri Jan 16 03:05:33 2015
New Revision: 22270

Log:
Update to 3.18.2

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Fri Jan 16 02:54:03 2015	(r22269)
+++ dists/trunk/linux/debian/changelog	Fri Jan 16 03:05:33 2015	(r22270)
@@ -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.

Modified: dists/trunk/linux/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch	Fri Jan 16 02:54:03 2015	(r22269)
+++ dists/trunk/linux/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch	Fri Jan 16 03:05:33 2015	(r22270)
@@ -89,5 +89,5 @@
 +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,