Hi all,

On Mon, 30 Jul 2018 15:12:13 +1000 Stephen Rothwell sfr@canb.auug.org.au wrote:

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

drivers/xen/gntdev-dmabuf.c:360:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .attach = dmabuf_exp_ops_attach, ^~~~~~~~~~~~~~~~~~~~~

Caused by commit

a240d6e42e28 ("xen/gntdev: Implement dma-buf export functionality")

interacting with commit

a19741e5e5a9 ("dma_buf: remove device parameter from attach callback v2")

from the drm tree.

I have added the following merge fix patch:

From: Stephen Rothwell sfr@canb.auug.org.au Date: Mon, 30 Jul 2018 15:08:21 +1000 Subject: [PATCH] xen/gntdev: fix up for attach callback API change

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/xen/gntdev-dmabuf.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c index faaa4d3970ea..744cfe9b0311 100644 --- a/drivers/xen/gntdev-dmabuf.c +++ b/drivers/xen/gntdev-dmabuf.c @@ -217,7 +217,6 @@ dmabuf_pages_to_sgt(struct page **pages, unsigned int nr_pages) }

static int dmabuf_exp_ops_attach(struct dma_buf *dma_buf,

• 		 struct device *target_dev,
  	 struct dma_buf_attachment *attach)
  

{ struct gntdev_dmabuf_attachment *gntdev_dmabuf_attach;

This is now a conflict between Linus' tree and the drm tree.