diff --git a/[refs] b/[refs]
index 4ef588133f84..563ab168132d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45e3e1935e2857c54783291107d33323b3ef33c8
+refs/heads/master: 0a8eba9b7f7aa3ad0305627c99ad4d6deedd871d
diff --git a/trunk/fs/ramfs/inode.c b/trunk/fs/ramfs/inode.c
index 3a6b193d8444..0ff7566c767c 100644
--- a/trunk/fs/ramfs/inode.c
+++ b/trunk/fs/ramfs/inode.c
@@ -202,9 +202,12 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts)
 				return -EINVAL;
 			opts->mode = option & S_IALLUGO;
 			break;
-		default:
-			printk(KERN_ERR "ramfs: bad mount option: %s\n", p);
-			return -EINVAL;
+		/*
+		 * We might like to report bad mount options here;
+		 * but traditionally ramfs has ignored all mount options,
+		 * and as it is used as a !CONFIG_SHMEM simple substitute
+		 * for tmpfs, better continue to ignore other mount options.
+		 */
 		}
 	}