Merge branch 'keys-fixes' into keys-next

Signed-off-by: David Howells <dhowells@redhat.com>

diff --cc crypto/asymmetric_keys/Kconfig
Simple merge

diff --cc fs/nfs/idmap.c
Simple merge

diff --cc include/linux/key.h
index 65316f7,e37a4d8..e1d4715
--- 1/include/linux/key.h
--- 2/include/linux/key.h
+++ b/include/linux/key.h
@@@ -170,7 -170,7 +170,8 @@@ struct key 
  #define KEY_FLAG_INVALIDATED  7       /* set if key has been invalidated */
  #define KEY_FLAG_TRUSTED      8       /* set if key is trusted */
  #define KEY_FLAG_TRUSTED_ONLY 9       /* set if keyring only accepts links to trusted keys */
 +#define KEY_FLAG_BUILTIN      10      /* set if key is builtin */
+ #define KEY_FLAG_ROOT_CAN_INVAL       11      /* set if key can be invalidated by root without permission */
  
        /* the key type and key description string
         * - the desc is used to match a key against search criteria

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