Merge branch 'master' into next
James Morris [Thu, 6 May 2010 12:21:04 +0000 (22:21 +1000)]
Conflicts:
security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

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

1  2 
security/keys/keyring.c
security/keys/request_key.c

  #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
Simple merge