diff --git a/[refs] b/[refs]
index dfa338c89f12..74e41608f3da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7686ad5606f08d9dfb33a2087a36c8366366015b
+refs/heads/master: af904deaf6da3f3285eb0a06a3dc6a1af0251030
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 9abcd2b329f7..e9b20173fef3 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1279,6 +1279,12 @@ static int nfs_parse_mount_options(char *raw,
 		}
 	}
 
+	if (errors > 0) {
+		dfprintk(MOUNT, "NFS: parsing encountered %d error%s\n",
+				errors, (errors == 1 ? "" : "s"));
+		if (!sloppy)
+			return 0;
+	}
 	return 1;
 
 out_nomem: