linux-next: manual merge of the y2038 tree with the vhost tree

[Stephen Rothwell]

Hi all,

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

  drivers/block/virtio_blk.c

between commit:

  d1281e3a562e ("virtio-blk: remove VIRTIO_BLK_F_SCSI support")

from the vhost tree and commit:

  d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")

from the y2038 tree.

I wonder if this driver needs a compat_ioctl entry at all any more?

I fixed it up (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/block/virtio_blk.c
index 54158766334b,fbbf18ac1d5d..000000000000
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -310,6 -404,10 +310,9 @@@ static int virtblk_getgeo(struct block_
  }
  
  static const struct block_device_operations virtblk_fops = {
 -	.ioctl  = virtblk_ioctl,
+ #ifdef CONFIG_COMPAT
+ 	.compat_ioctl = blkdev_compat_ptr_ioctl,
+ #endif
  	.owner  = THIS_MODULE,
  	.getgeo = virtblk_getgeo,
  };

Attachment: pgpW3h68Y8FqF.pgp
Description: OpenPGP digital signature