public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>, "Michael S. Tsirkin" <mst@redhat•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the y2038 tree with the vhost tree
Date: Mon, 6 Jan 2020 15:24:40 +1100	[thread overview]
Message-ID: <20200106152440.05a36767@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2020-01-06  4:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-06  4:24 Stephen Rothwell [this message]
2020-01-06  8:31 ` linux-next: manual merge of the y2038 tree with the vhost tree Arnd Bergmann
2020-01-06  9:25   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200106152440.05a36767@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=arnd@arndb$(echo .)de \
    --cc=hch@lst$(echo .)de \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mst@redhat$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox