linux-next: build failure after merging the drm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

samples/vfio-mdev/mbochs.c:827:3: error: 'struct dma_buf_ops' has no member named 'map_atomic'
  .map_atomic   = mbochs_kmap_atomic_dmabuf,
   ^~~~~~~~~~
samples/vfio-mdev/mbochs.c:827:18: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init]
  .map_atomic   = mbochs_kmap_atomic_dmabuf,
                  ^~~~~~~~~~~~~~~~~~~~~~~~~
samples/vfio-mdev/mbochs.c:827:18: note: (near initialization for 'mbochs_dmabuf_ops')
samples/vfio-mdev/mbochs.c:827:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
samples/vfio-mdev/mbochs.c:827:18: note: (near initialization for 'mbochs_dmabuf_ops.unmap')

Caused by commit

  f664a5269542 ("dma-buf: remove kmap_atomic interface")

interacting with commit

  a5e6e6505f38 ("sample: vfio bochs vbe display (host device for bochs-drm)")

from Linus' tree (v4.18-rc1).

I added the following just to disable the sample code until it can
be repaired.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Jun 2018 11:11:38 +1000
Subject: [PATCH] sample: disable the VFIO mdpy example mediated device sample code

it was broken by the removal of the dmap-buf kmap_atomic interface.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 samples/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/Kconfig b/samples/Kconfig
index bd133efc1a56..84bf618ad628 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -135,6 +135,7 @@ config SAMPLE_VFIO_MDEV_MDPY_FB
 config SAMPLE_VFIO_MDEV_MBOCHS
 	tristate "Build VFIO mdpy example mediated device sample code -- loadable modules only"
 	depends on VFIO_MDEV_DEVICE && m
+	depends on BROKEN
 	select DMA_SHARED_BUFFER
 	help
 	  Build a virtual display sample driver for use as a VFIO
-- 
2.17.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]