The patch titled Subject: keys: revert one application of "Fix unreachable code" patch has been removed from the -mm tree. Its filename was keys-revert-one-application-of-fix-unreachable-code-patch.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Alan Cox <alan@xxxxxxxxxxxxxxx> Subject: keys: revert one application of "Fix unreachable code" patch A patch to fix some unreachable code in search_my_process_keyrings() got applied twice by two different routes upstream: commit e67eab39bee26f509d38d00ca1a8f24b63f46a31 Author: Alan Cox <alan@xxxxxxxxxxxxxxx> Date: Thu Dec 20 15:05:54 2012 -0800 keys: fix unreachable code and: commit b010520ab3d2c05eb444ed5e01fe6c33842f597a Author: Alan Cox <alan@xxxxxxxxxxxxxxx> Date: Thu Oct 25 15:23:35 2012 +0100 keys: Fix unreachable code Unfortunately, the second application removed something it shouldn't have and this wasn't detected by GIT. This is due to the patch not having sufficient lines of context to distinguish the two places of application. So revert the second application of the patch. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- security/keys/process_keys.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN security/keys/process_keys.c~keys-revert-one-application-of-fix-unreachable-code-patch security/keys/process_keys.c --- a/security/keys/process_keys.c~keys-revert-one-application-of-fix-unreachable-code-patch +++ a/security/keys/process_keys.c @@ -367,6 +367,8 @@ key_ref_t search_my_process_keyrings(str switch (PTR_ERR(key_ref)) { case -EAGAIN: /* no key */ + if (ret) + break; case -ENOKEY: /* negative key */ ret = key_ref; break; _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxx are origin.patch linux-next.patch goldfish-framebuffer-driver.patch goldfish-framebuffer-driver-fix.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch coredump-remove-redundant-defines-for-dumpable-states.patch fork-unshare-remove-dead-code.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html