From patchwork Fri Apr 21 02:10:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9691681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D93EE6038D for ; Fri, 21 Apr 2017 02:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9E782847C for ; Fri, 21 Apr 2017 02:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BED4328501; Fri, 21 Apr 2017 02:10:36 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable 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 8F0112847C for ; Fri, 21 Apr 2017 02:10:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 944326E0B8; Fri, 21 Apr 2017 02:10:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A9FA6E0B8; Fri, 21 Apr 2017 02:10:31 +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 3w8K2W6Gqgz9s2s; Fri, 21 Apr 2017 12:10:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1492740627; bh=RajqYsEIgd/K7MDFBawkXKhXKUCAIqkxfFiwDoxie4o=; h=Date:From:To:Cc:Subject:From; b=kPn2FdwY1bWdaOVLzkULpwDQtKZ51LcTJuGWTwNwsrZG2E8/48zmo6J0gTBu6KpGA wGEZn9Nvyf4zzXH+hQljBmBG3kh9aPWnGspWGkBKxvOx8iNHZnbb5sf5a3IQlOQfvK enUzHPYXegWMwaE8ndw+ZZIfNNPMtyDoc8B1gQnMziKZJu6k4zmOSt0IZ+zD622G4d FhTPUTR0HQzWivrlc45AP3j0tStpNqihyeTfZjZlNRPZsYdTotzvBNg7bfy3lB4BoK cPusVV9HGxCPxhtMkuy9dMUn0N8HlxprWD42rkwJad1x4fxDnbvyOuP+ZN4SkmlC0i fpLZ1s0dR49qA== Date: Fri, 21 Apr 2017 12:10:14 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170421121014.3ee14a83@canb.auug.org.au> MIME-Version: 1.0 Cc: Jens Wiklander , Linux-Next Mailing List , Logan Gunthorpe , Linux Kernel Mailing List X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer .kmap_atomic = tee_shm_op_kmap_atomic, ^ drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .kmap_atomic = tee_shm_op_kmap_atomic, ^ drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access') drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer .kmap = tee_shm_op_kmap, ^ drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .kmap = tee_shm_op_kmap, ^ drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access') Caused by commit f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro") interacting with commit 967c9cca2cc5 ("tee: generic TEE subsystem") from the arm-soc tree. I applied the following merge fix patch for today: From: Stephen Rothwell Date: Fri, 21 Apr 2017 12:06:32 +1000 Subject: [PATCH] tee: merge fix for dma-ops field name changes Signed-off-by: Stephen Rothwell --- drivers/tee/tee_shm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 0be1e3e93bee..4e14c9c9cb1c 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { .map_dma_buf = tee_shm_op_map_dma_buf, .unmap_dma_buf = tee_shm_op_unmap_dma_buf, .release = tee_shm_op_release, - .kmap_atomic = tee_shm_op_kmap_atomic, - .kmap = tee_shm_op_kmap, + .map_atomic = tee_shm_op_kmap_atomic, + .map = tee_shm_op_kmap, .mmap = tee_shm_op_mmap, };