Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[mirror_ubuntu-zesty-kernel.git] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index 017b0826642f04c070137114ee98958737677cd6..e1d4715f322251591d7261a77e57f7e659c06881 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -170,6 +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