From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751318AbdEBIZ3 (ORCPT ); Tue, 2 May 2017 04:25:29 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34716 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106AbdEBIZX (ORCPT ); Tue, 2 May 2017 04:25:23 -0400 Date: Tue, 2 May 2017 10:25:18 +0200 From: Daniel Vetter To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , ARM , Dave Airlie , Daniel Vetter , Intel Graphics , DRI , Linux-Next Mailing List , Linux Kernel Mailing List , Logan Gunthorpe , Sumit Semwal , Jens Wiklander Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170502082518.jdk5tqjhvlsqntny@phenom.ffwll.local> Mail-Followup-To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , ARM , Dave Airlie , Intel Graphics , DRI , Linux-Next Mailing List , Linux Kernel Mailing List , Logan Gunthorpe , Sumit Semwal , Jens Wiklander References: <20170421121014.3ee14a83@canb.auug.org.au> <20170424112512.582d04da@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170424112512.582d04da@canb.auug.org.au> X-Operating-System: Linux phenom 4.9.0-2-amd64 User-Agent: NeoMutt/20170306 (1.8.0) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 24, 2017 at 11:25:12AM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell wrote: > > > > 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, > > }; Since this is an all-new driver it might be best to stagger the pull requests and merge the new tee subsystem (or whatever it is) after drm? Not sure what to best do here ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch