From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Juergen Gross <jgross@suse.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Xen Devel <Xen-devel@lists.xensource.com>,
Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "Linux-Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Christian König" <christian.koenig@amd.com>,
"Oleksandr Andrushchenko" <oleksandr_andrushchenko@epam.com>
Subject: linux-next: build failure after merge of the xen-tip tree
Date: Mon, 30 Jul 2018 15:12:13 +1000 [thread overview]
Message-ID: <20180730151213.4b1e1af4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
Hi all,
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;
--
2.18.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-07-30 5:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 5:12 Stephen Rothwell [this message]
2018-07-30 7:40 ` linux-next: build failure after merge of the xen-tip tree Oleksandr Andrushchenko
2018-08-16 0:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-09-15 1:11 Stephen Rothwell
2017-08-31 5:22 Stephen Rothwell
2015-04-13 8:09 Stephen Rothwell
2015-04-13 8:36 ` Bob Liu
2015-04-15 5:00 ` Stephen Rothwell
2015-04-15 10:03 ` David Vrabel
2015-04-15 10:03 ` David Vrabel
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=20180730151213.4b1e1af4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Xen-devel@lists.xensource.com \
--cc=airlied@linux.ie \
--cc=boris.ostrovsky@oracle.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oleksandr_andrushchenko@epam.com \
--cc=sstabellini@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.