The patch titled
     KEYS: fix macro
has been removed from the -mm tree.  Its filename was
     keys-fix-macro.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: KEYS: fix macro
From: Sebastian Siewior <[EMAIL PROTECTED]>

Commit 664cceb0093b755739e56572b836a99104ee8a75 changed the parameters of
the function make_key_ref().  The macros that are used in case CONFIG_KEY
is not defined did not change.

Cc: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Sebastian Siewior <[EMAIL PROTECTED]>
Acked-by: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/linux/key.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/key.h~keys-fix-macro include/linux/key.h
--- a/include/linux/key.h~keys-fix-macro
+++ a/include/linux/key.h
@@ -290,7 +290,7 @@ extern void key_init(void);
 #define key_get(k)                     ({ NULL; })
 #define key_put(k)                     do { } while(0)
 #define key_ref_put(k)                 do { } while(0)
-#define make_key_ref(k)                        ({ NULL; })
+#define make_key_ref(k, p)                     ({ NULL; })
 #define key_ref_to_ptr(k)              ({ NULL; })
 #define is_key_possessed(k)            0
 #define alloc_uid_keyring(u,c)         0
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-net.patch
git-cryptodev.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to