Merge branch 'next-queue' into next

2012-02-09 17:02:34 +11:00
parent 2eb6038c51 4c2c392763
commit 9e3ff38647
10 changed files with 28 additions and 3 deletions
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -155,6 +155,7 @@ struct key {
 #define KEY_FLAG_IN_QUOTA	3	/* set if key consumes quota */
 #define KEY_FLAG_USER_CONSTRUCT	4	/* set if key is being constructed in userspace */
 #define KEY_FLAG_NEGATIVE	5	/* set if key is negative */
+#define KEY_FLAG_ROOT_CAN_CLEAR	6	/* set if key can be cleared by root without permission */

 	/* the description string
 	 * - this is used to match a key against search criteria