From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163966AbdDXBZX (ORCPT ); Sun, 23 Apr 2017 21:25:23 -0400 Received: from ozlabs.org ([103.22.144.67]:44251 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163904AbdDXBZP (ORCPT ); Sun, 23 Apr 2017 21:25:15 -0400 Date: Mon, 24 Apr 2017 11:25:12 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Dave Airlie Cc: 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: <20170424112512.582d04da@canb.auug.org.au> In-Reply-To: <20170421121014.3ee14a83@canb.auug.org.au> References: <20170421121014.3ee14a83@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, > }; > > -- > 2.11.0 This merge fix is now needed when I merge the drm tree (as Dave merged the drm-misc tree). -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: sfr@canb.auug.org.au (Stephen Rothwell) Date: Mon, 24 Apr 2017 11:25:12 +1000 Subject: linux-next: build failure after merge of the drm-misc tree In-Reply-To: <20170421121014.3ee14a83@canb.auug.org.au> References: <20170421121014.3ee14a83@canb.auug.org.au> Message-ID: <20170424112512.582d04da@canb.auug.org.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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, > }; > > -- > 2.11.0 This merge fix is now needed when I merge the drm tree (as Dave merged the drm-misc tree). -- Cheers, Stephen Rothwell