Merge remote-tracking branch 'scsi/for-next'

# Conflicts:
#	drivers/scsi/st.c

diff --cc block/Kconfig
Simple merge

diff --cc block/Makefile
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/block/Kconfig
Simple merge

diff --cc drivers/scsi/cxlflash/main.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
index d1abc020f3c0f7b7f6063f1cbe44418ee9069356,2d1b0594af691db4d4e9e7e706331a9d1f4f66d2..9d04929f03a10af482b001a2d35cef6ca0f8d820
--- 1/drivers/scsi/st.c
--- 2/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@@ -3815,35 -3821,24 +3816,24 @@@ static long st_ioctl(struct file *file
                goto out;
        }
        mutex_unlock(&STp->lock);
-       switch (cmd_in) {
-               case SCSI_IOCTL_STOP_UNIT:
-                       /* unload */
-                       retval = scsi_ioctl(STp->device, cmd_in, p);
-                       if (!retval) {
-                               STp->rew_at_close = 0;
-                               STp->ready = ST_NO_TAPE;
-                       }
-                       return retval;
  
-               case SCSI_IOCTL_GET_IDLUN:
-               case SCSI_IOCTL_GET_BUS_NUMBER:
-                       break;
+       switch (cmd_in) {
+       case SG_IO:
+       case SCSI_IOCTL_SEND_COMMAND:
+       case CDROM_SEND_PACKET:
+               if (!capable(CAP_SYS_RAWIO))
+                       return -EPERM;
+       default:
+               break;
+       }
  
-               default:
-                       if ((cmd_in == SG_IO ||
-                            cmd_in == SCSI_IOCTL_SEND_COMMAND ||
-                            cmd_in == CDROM_SEND_PACKET) &&
-                           !capable(CAP_SYS_RAWIO))
-                               i = -EPERM;
-                       else
-                               i = scsi_cmd_ioctl(STp->device->request_queue,
-                                                  NULL, file->f_mode, cmd_in,
-                                                  p);
-                       if (i != -ENOTTY)
-                               return i;
-                       break;
 -      retval = scsi_ioctl(STp->device, STp->disk, file->f_mode, cmd_in, p);
++      retval = scsi_ioctl(STp->device, NULL, file->f_mode, cmd_in, p);
+       if (!retval && cmd_in == SCSI_IOCTL_STOP_UNIT) {
+               /* unload */
+               STp->rew_at_close = 0;
+               STp->ready = ST_NO_TAPE;
        }
-       return -ENOTTY;
+       return retval;
  
   out:
        mutex_unlock(&STp->lock);

diff --cc drivers/target/loopback/tcm_loop.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge