diff --git a/[refs] b/[refs]
index 00a9e5416369..ec4567fd182c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 241fd9bcbc10c144531e88b5e3a62bc11090e5e4
+refs/heads/master: a2aec0d3e22f3f940a165181ef339ac16deefa7c
diff --git a/trunk/arch/s390/include/asm/compat.h b/trunk/arch/s390/include/asm/compat.h
index f8c6df6cd1f0..d967ac8d55d0 100644
--- a/trunk/arch/s390/include/asm/compat.h
+++ b/trunk/arch/s390/include/asm/compat.h
@@ -135,7 +135,7 @@ struct compat_statfs {
 	s32		f_namelen;
 	s32		f_frsize;
 	s32		f_flags;
-	s32		f_spare[5];
+	s32		f_spare[4];
 };
 
 #define COMPAT_RLIM_OLD_INFINITY	0x7fffffff