Merge tag 'block-ioctl-cleanup-5.6' into 5.6/scsi-queue