Merge branch 'next' into for-linus

Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 4414abddcb5b..4f64c7267afb 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -291,6 +291,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
 
         atomic_set(&key->usage, 1);
         init_rwsem(&key->sem);
+        lockdep_set_class(&key->sem, &type->lock_class);
         key->type = type;
         key->user = user;
         key->quotalen = quotalen;
@@ -946,6 +947,8 @@ int register_key_type(struct key_type *ktype)
         struct key_type *p;
         int ret;
 
+        memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
+
         ret = -EEXIST;
         down_write(&key_types_sem);