Merge branch 'for-linus' into test

author Jens Axboe <[email protected]>

Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)

committer Jens Axboe <[email protected]>

Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
author Jens Axboe <[email protected]>
Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
committer Jens Axboe <[email protected]>
Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
diff --cc drivers/md/dm-rq.c
Simple merge
diff --cc drivers/scsi/scsi_lib.c
Simple merge
author	Jens Axboe <[email protected]>
	Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
committer	Jens Axboe <[email protected]>
	Fri, 2 Feb 2018 03:27:02 +0000 (20:27 -0700)
		1	2
drivers/md/dm-rq.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history