diff --git a/[refs] b/[refs]
index 77c6b59390a1..677cc4fa804e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c46f739dd39db3b07ab5deb4e3ec81e1c04a91af
+refs/heads/master: d3938204468dccae16be0099a2abf53db4ed0505
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 282240afe99e..4ccaaa4b13b2 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1780,12 +1780,6 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)
 	   but keep the previous behaviour for now. */
 	if (!ispipe && !S_ISREG(inode->i_mode))
 		goto close_fail;
-	/*
-	 * Dont allow local users get cute and trick others to coredump
-	 * into their pre-created files:
-	 */
-	if (inode->i_uid != current->fsuid)
-		goto close_fail;
 	if (!file->f_op)
 		goto close_fail;
 	if (!file->f_op->write)
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
index 27a2338deb4a..cb89fa8db110 100644
--- a/trunk/kernel/time/tick-sched.c
+++ b/trunk/kernel/time/tick-sched.c
@@ -133,6 +133,8 @@ void tick_nohz_update_jiffies(void)
 	if (!ts->tick_stopped)
 		return;
 
+	touch_softlockup_watchdog();
+
 	cpu_clear(cpu, nohz_cpu_mask);
 	now = ktime_get();