diff --git a/[refs] b/[refs]
index 74d69bd21db9..b7d9d60f4826 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aedfa8f25c13a2f5428cb1b0f806e04121cbef5
+refs/heads/master: d13b0b6d51e78b0107c76d79cf0ef06d9e07650b
diff --git a/trunk/drivers/staging/fwserial/fwserial.c b/trunk/drivers/staging/fwserial/fwserial.c
index cad9e98e0e6a..8859c75f16fa 100644
--- a/trunk/drivers/staging/fwserial/fwserial.c
+++ b/trunk/drivers/staging/fwserial/fwserial.c
@@ -578,7 +578,7 @@ static int fwtty_buffer_rx(struct fwtty_port *port, unsigned char *d, size_t n)
 	size_t size = (n + sizeof(struct buffered_rx) + 0xFF) & ~0xFF;
 
 	if (port->buffered + n > HIGH_WATERMARK) {
-		fwtty_err_ratelimited(port, "overflowed rx buffer: buffered: %d new: %ld wtrmk: %d",
+		fwtty_err_ratelimited(port, "overflowed rx buffer: buffered: %d new: %zu wtrmk: %d",
 				      port->buffered, n, HIGH_WATERMARK);
 		return 0;
 	}