diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-11-08 17:08:12 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-11-08 17:08:12 +0100 |
| commit | e37459b8e2c7db6735e39e019e448b76e5e77647 (patch) | |
| tree | a3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b /drivers/scsi/sd.c | |
| parent | block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff) | |
| parent | blk-mq: don't disallow request merges for req->special being set (diff) | |
| download | linux-e37459b8e2c7db6735e39e019e448b76e5e77647.tar.xz linux-e37459b8e2c7db6735e39e019e448b76e5e77647.zip | |
Merge branch 'blk-mq/core' into for-3.13/core
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-timeout.c
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 5693f6d7eddb..7fe4faaa149b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1002,7 +1002,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) SCpnt->cmnd[0] = READ_6; SCpnt->sc_data_direction = DMA_FROM_DEVICE; } else { - scmd_printk(KERN_ERR, SCpnt, "Unknown command %x\n", rq->cmd_flags); + scmd_printk(KERN_ERR, SCpnt, "Unknown command %llx\n", (unsigned long long) rq->cmd_flags); goto out; } |