Merge branch 'master' into next

Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

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

diff --cc security/keys/keyring.c
index 29de5ee3457bd305676fca8a7c56a0613c6d0d8e,1e4b0037935c8ff56434e70d5786b02e6e7be33d..3f425a65906f1ef9f8432907b45d94c86cab0368
--- 1/security/keys/keyring.c
--- 2/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@@ -17,9 -17,14 +17,14 @@@
  #include <linux/seq_file.h>
  #include <linux/err.h>
  #include <keys/keyring-type.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include "internal.h"
  
+ #define rcu_dereference_locked_keyring(keyring)                               \
+       (rcu_dereference_protected(                                     \
+               (keyring)->payload.subscriptions,                       \
+               rwsem_is_locked((struct rw_semaphore *)&(keyring)->sem)))
+ 
  /*
   * when plumbing the depths of the key tree, this sets a hard limit set on how
   * deep we're willing to go

diff --cc security/keys/request_key.c
Simple merge