diff --git a/[refs] b/[refs]
index 5e44ddec5495..c023618d008c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 572acc41274522b865440d0644d5f986e3c83755
+refs/heads/master: 647b0d3854d776485faea9de7e7ed7fd4bdc6f20
diff --git a/trunk/drivers/mtd/tests/mtd_subpagetest.c b/trunk/drivers/mtd/tests/mtd_subpagetest.c
index 4c5e04d0b328..5b889724268e 100644
--- a/trunk/drivers/mtd/tests/mtd_subpagetest.c
+++ b/trunk/drivers/mtd/tests/mtd_subpagetest.c
@@ -125,7 +125,7 @@ static int write_eraseblock(int ebnum)
 		       (long long)addr);
 		if (written != subpgsize) {
 			printk(PRINT_PREF "  write size: %#x\n", subpgsize);
-			printk(PRINT_PREF "  written: %#x\n", written);
+			printk(PRINT_PREF "  written: %#zx\n", written);
 		}
 		return err ? err : -1;
 	}
@@ -139,7 +139,7 @@ static int write_eraseblock(int ebnum)
 		       (long long)addr);
 		if (written != subpgsize) {
 			printk(PRINT_PREF "  write size: %#x\n", subpgsize);
-			printk(PRINT_PREF "  written: %#x\n", written);
+			printk(PRINT_PREF "  written: %#zx\n", written);
 		}
 		return err ? err : -1;
 	}
@@ -164,7 +164,7 @@ static int write_eraseblock2(int ebnum)
 			if (written != subpgsize) {
 				printk(PRINT_PREF "  write size: %#x\n",
 				       subpgsize * k);
-				printk(PRINT_PREF "  written: %#08x\n",
+				printk(PRINT_PREF "  written: %#08zx\n",
 				       written);
 			}
 			return err ? err : -1;
diff --git a/trunk/drivers/mtd/tests/mtd_torturetest.c b/trunk/drivers/mtd/tests/mtd_torturetest.c
index 2928d9e84eae..631a0ab3a33c 100644
--- a/trunk/drivers/mtd/tests/mtd_torturetest.c
+++ b/trunk/drivers/mtd/tests/mtd_torturetest.c
@@ -450,7 +450,7 @@ static void report_corrupt(unsigned char *read, unsigned char *written)
 		printk("-------------------------------------------------------"
 		       "----------------------------------\n");
 
-		printk(PRINT_PREF "Page %d has %d bytes/%d bits failing verify,"
+		printk(PRINT_PREF "Page %zd has %d bytes/%d bits failing verify,"
 		       " starting at offset 0x%x\n",
 		       (mtd->erasesize - check_len + i) / pgsize,
 		       bytes, bits, first);