diff --git a/[refs] b/[refs]
index 02091bb4d6de..144b724040d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d69b2e63e9172afb4d07c305601b79a55509ac4c
+refs/heads/master: 12821f5fb942e795f8009ece14bde868893bd811
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index 10db44f95749..fb71790398f0 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -2214,6 +2214,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
 		if (nodelist)
 			goto out;
 		mode = MPOL_PREFERRED;
+		err = 0;
 		break;
 	case MPOL_DEFAULT:
 		/*