diff --git a/[refs] b/[refs]
index 5f9091a3a955..6f665e3a1a46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 756aca7edd37611b73e1e86ea64a67b62d251509
+refs/heads/master: c498bf1a1bd4e4a9140045b747cafe6386bc59a5
diff --git a/trunk/drivers/scsi/scsi_trace.c b/trunk/drivers/scsi/scsi_trace.c
index b587289cfacb..2bea4f0b684a 100644
--- a/trunk/drivers/scsi/scsi_trace.c
+++ b/trunk/drivers/scsi/scsi_trace.c
@@ -59,6 +59,10 @@ scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len)
 	trace_seq_printf(p, "lba=%llu txlen=%llu protect=%u",
 			 (unsigned long long)lba, (unsigned long long)txlen,
 			 cdb[1] >> 5);
+
+	if (cdb[0] == WRITE_SAME)
+		trace_seq_printf(p, " unmap=%u", cdb[1] >> 3 & 1);
+
 	trace_seq_putc(p, 0);
 
 	return ret;