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: NJens Axboe <axboe@fb.com>

Conflicts:
	block/scsi_ioctl.c