diff --git a/[refs] b/[refs]
index 45579b06d47a..9bd1237c4e0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d2beb135986477f53da77303356bd04329f8d0e
+refs/heads/master: c41ff6e5f38b02ff927d0d510e28dc1392bb4690
diff --git a/trunk/fs/jffs2/summary.c b/trunk/fs/jffs2/summary.c
index 7b0ed77a4c35..48293c197f13 100644
--- a/trunk/fs/jffs2/summary.c
+++ b/trunk/fs/jffs2/summary.c
@@ -655,7 +655,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
 
 
 	if (ret || (retlen != infosize)) {
-		JFFS2_WARNING("Write of %d bytes at 0x%08x failed. returned %d, retlen %zu\n",
+		JFFS2_WARNING("Write of %u bytes at 0x%08x failed. returned %d, retlen %zd\n",
 			infosize, jeb->offset + c->sector_size - jeb->free_size, ret, retlen);
 
 		c->summary->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;