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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Tue, 2 May 2017 10:25:18 +0200 Message-ID: <20170502082518.jdk5tqjhvlsqntny@phenom.ffwll.local> References: <20170421121014.3ee14a83@canb.auug.org.au> <20170424112512.582d04da@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170424112512.582d04da@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell Cc: Arnd Bergmann , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Jens Wiklander , Linux-Next Mailing List , Logan Gunthorpe , ARM List-Id: linux-next.vger.kernel.org T24gTW9uLCBBcHIgMjQsIDIwMTcgYXQgMTE6MjU6MTJBTSArMTAwMCwgU3RlcGhlbiBSb3Rod2Vs bCB3cm90ZToKPiBIaSBhbGwsCj4gCj4gT24gRnJpLCAyMSBBcHIgMjAxNyAxMjoxMDoxNCArMTAw MCBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4gPgo+ID4g QWZ0ZXIgbWVyZ2luZyB0aGUgZHJtLW1pc2MgdHJlZSwgdG9kYXkncyBsaW51eC1uZXh0IGJ1aWxk ICh4ODZfNjQKPiA+IGFsbG1vZGNvbmZpZykgZmFpbGVkIGxpa2UgdGhpczoKPiA+IAo+ID4gZHJp dmVycy90ZWUvdGVlX3NobS5jOjg3OjI6IGVycm9yOiB1bmtub3duIGZpZWxkICdrbWFwX2F0b21p Yycgc3BlY2lmaWVkIGluIGluaXRpYWxpemVyCj4gPiAgIC5rbWFwX2F0b21pYyA9IHRlZV9zaG1f b3Bfa21hcF9hdG9taWMsCj4gPiAgIF4KPiA+IGRyaXZlcnMvdGVlL3RlZV9zaG0uYzo4NzoxNzog ZXJyb3I6IGluaXRpYWxpemF0aW9uIGZyb20gaW5jb21wYXRpYmxlIHBvaW50ZXIgdHlwZSBbLVdl cnJvcj1pbmNvbXBhdGlibGUtcG9pbnRlci10eXBlc10KPiA+ICAgLmttYXBfYXRvbWljID0gdGVl X3NobV9vcF9rbWFwX2F0b21pYywKPiA+ICAgICAgICAgICAgICAgICAgXgo+ID4gZHJpdmVycy90 ZWUvdGVlX3NobS5jOjg3OjE3OiBub3RlOiAobmVhciBpbml0aWFsaXphdGlvbiBmb3IgJ3RlZV9z aG1fZG1hX2J1Zl9vcHMuYmVnaW5fY3B1X2FjY2VzcycpCj4gPiBkcml2ZXJzL3RlZS90ZWVfc2ht LmM6ODg6MjogZXJyb3I6IHVua25vd24gZmllbGQgJ2ttYXAnIHNwZWNpZmllZCBpbiBpbml0aWFs aXplcgo+ID4gICAua21hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiA+ICAgXgo+ID4gZHJpdmVycy90 ZWUvdGVlX3NobS5jOjg4OjEwOiBlcnJvcjogaW5pdGlhbGl6YXRpb24gZnJvbSBpbmNvbXBhdGli bGUgcG9pbnRlciB0eXBlIFstV2Vycm9yPWluY29tcGF0aWJsZS1wb2ludGVyLXR5cGVzXQo+ID4g ICAua21hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiA+ICAgICAgICAgICBeCj4gPiBkcml2ZXJzL3Rl ZS90ZWVfc2htLmM6ODg6MTA6IG5vdGU6IChuZWFyIGluaXRpYWxpemF0aW9uIGZvciAndGVlX3No bV9kbWFfYnVmX29wcy5lbmRfY3B1X2FjY2VzcycpCj4gPiAKPiA+IENhdXNlZCBieSBjb21taXQK PiA+IAo+ID4gICBmOWI2N2YwMDE0Y2IgKCJkbWEtYnVmOiBSZW5hbWUgZG1hLW9wcyB0byBwcmV2 ZW50IGNvbmZsaWN0IHdpdGgga3VubWFwX2F0b21pYyBtYWNybyIpCj4gPiAKPiA+IGludGVyYWN0 aW5nIHdpdGggY29tbWl0Cj4gPiAKPiA+ICAgOTY3YzljY2EyY2M1ICgidGVlOiBnZW5lcmljIFRF RSBzdWJzeXN0ZW0iKQo+ID4gCj4gPiBmcm9tIHRoZSBhcm0tc29jIHRyZWUuCj4gPiAKPiA+IEkg YXBwbGllZCB0aGUgZm9sbG93aW5nIG1lcmdlIGZpeCBwYXRjaCBmb3IgdG9kYXk6Cj4gPiAKPiA+ IEZyb206IFN0ZXBoZW4gUm90aHdlbGwgPHNmckBjYW5iLmF1dWcub3JnLmF1Pgo+ID4gRGF0ZTog RnJpLCAyMSBBcHIgMjAxNyAxMjowNjozMiArMTAwMAo+ID4gU3ViamVjdDogW1BBVENIXSB0ZWU6 IG1lcmdlIGZpeCBmb3IgZG1hLW9wcyBmaWVsZCBuYW1lIGNoYW5nZXMKPiA+IAo+ID4gU2lnbmVk LW9mZi1ieTogU3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcuYXU+Cj4gPiAtLS0K PiA+ICBkcml2ZXJzL3RlZS90ZWVfc2htLmMgfCA0ICsrLS0KPiA+ICAxIGZpbGUgY2hhbmdlZCwg MiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy90ZWUvdGVlX3NobS5jIGIvZHJpdmVycy90ZWUvdGVlX3NobS5jCj4gPiBpbmRleCAwYmUx ZTNlOTNiZWUuLjRlMTRjOWM5Y2IxYyAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvdGVlL3RlZV9z aG0uYwo+ID4gKysrIGIvZHJpdmVycy90ZWUvdGVlX3NobS5jCj4gPiBAQCAtODQsOCArODQsOCBA QCBzdGF0aWMgc3RydWN0IGRtYV9idWZfb3BzIHRlZV9zaG1fZG1hX2J1Zl9vcHMgPSB7Cj4gPiAg CS5tYXBfZG1hX2J1ZiA9IHRlZV9zaG1fb3BfbWFwX2RtYV9idWYsCj4gPiAgCS51bm1hcF9kbWFf YnVmID0gdGVlX3NobV9vcF91bm1hcF9kbWFfYnVmLAo+ID4gIAkucmVsZWFzZSA9IHRlZV9zaG1f b3BfcmVsZWFzZSwKPiA+IC0JLmttYXBfYXRvbWljID0gdGVlX3NobV9vcF9rbWFwX2F0b21pYywK PiA+IC0JLmttYXAgPSB0ZWVfc2htX29wX2ttYXAsCj4gPiArCS5tYXBfYXRvbWljID0gdGVlX3No bV9vcF9rbWFwX2F0b21pYywKPiA+ICsJLm1hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiA+ICAJLm1t YXAgPSB0ZWVfc2htX29wX21tYXAsCj4gPiAgfTsKClNpbmNlIHRoaXMgaXMgYW4gYWxsLW5ldyBk cml2ZXIgaXQgbWlnaHQgYmUgYmVzdCB0byBzdGFnZ2VyIHRoZSBwdWxsCnJlcXVlc3RzIGFuZCBt ZXJnZSB0aGUgbmV3IHRlZSBzdWJzeXN0ZW0gKG9yIHdoYXRldmVyIGl0IGlzKSBhZnRlciBkcm0/ CgpOb3Qgc3VyZSB3aGF0IHRvIGJlc3QgZG8gaGVyZSAuLi4KLURhbmllbAotLSAKRGFuaWVsIFZl dHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3 bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel@ffwll.ch (Daniel Vetter) Date: Tue, 2 May 2017 10:25:18 +0200 Subject: linux-next: build failure after merge of the drm-misc tree In-Reply-To: <20170424112512.582d04da@canb.auug.org.au> References: <20170421121014.3ee14a83@canb.auug.org.au> <20170424112512.582d04da@canb.auug.org.au> Message-ID: <20170502082518.jdk5tqjhvlsqntny@phenom.ffwll.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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