Merge branch 'master' into next

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 86b00c53fade..226da2733c1e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -771,8 +771,7 @@ config SLAB
         help
           The regular slab allocator that is established and known to work
           well in all environments. It organizes cache hot objects in
-          per cpu and per node queues. SLAB is the default choice for
-          a slab allocator.
+          per cpu and per node queues.
 
 config SLUB
         bool "SLUB (Unqueued Allocator)"
@@ -781,7 +780,8 @@ config SLUB
            instead of managing queues of cached objects (SLAB approach).
            Per cpu caching is realized using slabs of objects instead
            of queues of objects. SLUB can use memory efficiently
-           and has enhanced diagnostics.
+           and has enhanced diagnostics. SLUB is the default choice for
+           a slab allocator.
 
 config SLOB
         depends on EMBEDDED