diff --git a/[refs] b/[refs]
index cf0fafaf27cb..68a65a6f20a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33e73e0085089a2653cd638c990996b90833819b
+refs/heads/master: 6394c5a0379d0733396edd9452e31282e0684a3c
diff --git a/trunk/drivers/staging/usbip/stub_tx.c b/trunk/drivers/staging/usbip/stub_tx.c
index 1cbae44ba0dc..023fda305be2 100644
--- a/trunk/drivers/staging/usbip/stub_tx.c
+++ b/trunk/drivers/staging/usbip/stub_tx.c
@@ -231,7 +231,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
 			if (txsize != sizeof(pdu_header) + urb->actual_length) {
 				dev_err(&sdev->interface->dev,
 					"actual length of urb %d does not "
-					"match iso packet sizes %lu\n",
+					"match iso packet sizes %zu\n",
 					urb->actual_length,
 					txsize-sizeof(pdu_header));
 				kfree(iov);