linux-next: manual merge of the scsi tree with the block tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the scsi tree got a conflict in:

  drivers/scsi/st.c

between commit:

  45938335d0a9 ("st: do not allocate a gendisk")

from the block tree and commits:

  dba7688fc903 ("scsi: st: Simplify ioctl handling")
  2e27f576abc6 ("scsi: scsi_ioctl: Call scsi_cmd_ioctl() from scsi_ioctl()")

from the scsi tree.

I fixed it up (I think, see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/st.c
index d1abc020f3c0,2d1b0594af69..000000000000
--- a/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);

Attachment: pgpwiKNHFjLd2.pgp
Description: OpenPGP digital signature