diff --git a/[refs] b/[refs]
index 107081a4aa07..3406ad49f02f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0661111e5441995f7a69dc4336c9f131cb9bc58
+refs/heads/master: d3561f78fd379a7110e46c87964ba7aa4120235c
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 9e157e0240d4..19d058be49d4 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1656,6 +1656,13 @@ asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim)
 
 	if (resource != RLIMIT_CPU)
 		goto out;
+
+	/*
+	 * RLIMIT_CPU handling.   Note that the kernel fails to return an error
+	 * code if it rejected the user's attempt to set RLIMIT_CPU.  This is a
+	 * very long-standing error, and fixing it now risks breakage of
+	 * applications, so we live with it
+	 */
 	if (new_rlim.rlim_cur == RLIM_INFINITY)
 		goto out;