Merge branch 'next' into for-linus

2009-09-11 08:04:49 +10:00
parent 74fca6a428 9f0ab4a3f0
commit a3c8b97396
97 changed files with 2245 additions and 609 deletions
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -869,6 +869,8 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
 	if (thread_info_flags & _TIF_NOTIFY_RESUME) {
 		clear_thread_flag(TIF_NOTIFY_RESUME);
 		tracehook_notify_resume(regs);
+		if (current->replacement_session_keyring)
+			key_replace_session_keyring();
 	}

 #ifdef CONFIG_X86_32