On Wed, 20 Feb 2013 12:24:32 +0000 David Howells <[email protected]> wrote:
> 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 <[email protected]> > Date: Thu Dec 20 15:05:54 2012 -0800 > keys: fix unreachable code > > and: > > commit b010520ab3d2c05eb444ed5e01fe6c33842f597a > Author: Alan Cox <[email protected]> > 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. The runtime effects of this aren't described, so I don't know whether the omission of cc:stable was deliberate :( -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
