lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' into for-3.18/core

Browse Source 
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.

Signed-off-by: Jens Axboe <axboe@fb.com>

Conflicts:
	block/scsi_ioctl.c
This commit is contained in:
Jens Axboe
2014-09-11 09:31:18 -06:00
parent 018a17bdc8 a516440542
commit b207892b06
346 changed files with 2828 additions and 1783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/scsi_lib.c
View File

@@ -1808,7 +1808,6 @@ static int scsi_mq_prep_fn(struct request *req)
cmd->tag = req->tag;
req->cmd = req->__cmd;
cmd->cmnd = req->cmd;
cmd->prot_op = SCSI_PROT_NORMAL;