From: David Howells Date: Tue, 22 Jul 2014 20:55:45 +0000 (+0100) Subject: Merge branch 'keys-fixes' into keys-next X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~14015^2~12^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=633706a2ee81637be37b6bc02c5336950cc163b5;p=mirror_ubuntu-focal-kernel.git Merge branch 'keys-fixes' into keys-next Signed-off-by: David Howells --- 633706a2ee81637be37b6bc02c5336950cc163b5 diff --cc include/linux/key.h index 65316f7ae794,e37a4d807185..e1d4715f3222 --- a/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