From patchwork Mon Jul 30 05:12:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10548409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5EC6139A for ; Mon, 30 Jul 2018 05:12:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3A3329897 for ; Mon, 30 Jul 2018 05:12:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C79E72989C; Mon, 30 Jul 2018 05:12:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1B6E29897 for ; Mon, 30 Jul 2018 05:12:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01DF289E0C; Mon, 30 Jul 2018 05:12:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id E405189E0C for ; Mon, 30 Jul 2018 05:12:21 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 41f73f1k8Xz9rvt; Mon, 30 Jul 2018 15:12:14 +1000 (AEST) Date: Mon, 30 Jul 2018 15:12:13 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , Xen Devel , Dave Airlie , DRI Subject: linux-next: build failure after merge of the xen-tip tree Message-ID: <20180730151213.4b1e1af4@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleksandr Andrushchenko , Linux-Next Mailing List , Linux Kernel Mailing List , Christian =?utf-8?b?S8O2bmln?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 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 Reviewed-by: Oleksandr Andrushchenko --- 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;