From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752129AbdECXuX (ORCPT ); Wed, 3 May 2017 19:50:23 -0400 Received: from ozlabs.org ([103.22.144.67]:33975 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751366AbdECXuP (ORCPT ); Wed, 3 May 2017 19:50:15 -0400 Date: Thu, 4 May 2017 09:50:12 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Olof Johansson , Arnd Bergmann , ARM Cc: 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: <20170504095012.2c109448@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 fixup is now needed when merging the arm-soc tree with Linus' tree. -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Thu, 4 May 2017 09:50:12 +1000 Message-ID: <20170504095012.2c109448@canb.auug.org.au> References: <20170421121014.3ee14a83@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170421121014.3ee14a83@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Intel Graphics , DRI , Olof Johansson , Arnd Bergmann , ARM Cc: Jens Wiklander , Linux-Next Mailing List , Logan Gunthorpe , Linux Kernel Mailing List , Sumit Semwal List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKT24gRnJpLCAyMSBBcHIgMjAxNyAxMjoxMDoxNCArMTAwMCBTdGVwaGVuIFJvdGh3 ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4KPiBBZnRlciBtZXJnaW5nIHRoZSBk cm0tbWlzYyB0cmVlLCB0b2RheSdzIGxpbnV4LW5leHQgYnVpbGQgKHg4Nl82NAo+IGFsbG1vZGNv bmZpZykgZmFpbGVkIGxpa2UgdGhpczoKPiAKPiBkcml2ZXJzL3RlZS90ZWVfc2htLmM6ODc6Mjog ZXJyb3I6IHVua25vd24gZmllbGQgJ2ttYXBfYXRvbWljJyBzcGVjaWZpZWQgaW4gaW5pdGlhbGl6 ZXIKPiAgIC5rbWFwX2F0b21pYyA9IHRlZV9zaG1fb3Bfa21hcF9hdG9taWMsCj4gICBeCj4gZHJp dmVycy90ZWUvdGVlX3NobS5jOjg3OjE3OiBlcnJvcjogaW5pdGlhbGl6YXRpb24gZnJvbSBpbmNv bXBhdGlibGUgcG9pbnRlciB0eXBlIFstV2Vycm9yPWluY29tcGF0aWJsZS1wb2ludGVyLXR5cGVz XQo+ICAgLmttYXBfYXRvbWljID0gdGVlX3NobV9vcF9rbWFwX2F0b21pYywKPiAgICAgICAgICAg ICAgICAgIF4KPiBkcml2ZXJzL3RlZS90ZWVfc2htLmM6ODc6MTc6IG5vdGU6IChuZWFyIGluaXRp YWxpemF0aW9uIGZvciAndGVlX3NobV9kbWFfYnVmX29wcy5iZWdpbl9jcHVfYWNjZXNzJykKPiBk cml2ZXJzL3RlZS90ZWVfc2htLmM6ODg6MjogZXJyb3I6IHVua25vd24gZmllbGQgJ2ttYXAnIHNw ZWNpZmllZCBpbiBpbml0aWFsaXplcgo+ICAgLmttYXAgPSB0ZWVfc2htX29wX2ttYXAsCj4gICBe Cj4gZHJpdmVycy90ZWUvdGVlX3NobS5jOjg4OjEwOiBlcnJvcjogaW5pdGlhbGl6YXRpb24gZnJv bSBpbmNvbXBhdGlibGUgcG9pbnRlciB0eXBlIFstV2Vycm9yPWluY29tcGF0aWJsZS1wb2ludGVy LXR5cGVzXQo+ICAgLmttYXAgPSB0ZWVfc2htX29wX2ttYXAsCj4gICAgICAgICAgIF4KPiBkcml2 ZXJzL3RlZS90ZWVfc2htLmM6ODg6MTA6IG5vdGU6IChuZWFyIGluaXRpYWxpemF0aW9uIGZvciAn dGVlX3NobV9kbWFfYnVmX29wcy5lbmRfY3B1X2FjY2VzcycpCj4gCj4gQ2F1c2VkIGJ5IGNvbW1p dAo+IAo+ICAgZjliNjdmMDAxNGNiICgiZG1hLWJ1ZjogUmVuYW1lIGRtYS1vcHMgdG8gcHJldmVu dCBjb25mbGljdCB3aXRoIGt1bm1hcF9hdG9taWMgbWFjcm8iKQo+IAo+IGludGVyYWN0aW5nIHdp dGggY29tbWl0Cj4gCj4gICA5NjdjOWNjYTJjYzUgKCJ0ZWU6IGdlbmVyaWMgVEVFIHN1YnN5c3Rl bSIpCj4gCj4gZnJvbSB0aGUgYXJtLXNvYyB0cmVlLgo+IAo+IEkgYXBwbGllZCB0aGUgZm9sbG93 aW5nIG1lcmdlIGZpeCBwYXRjaCBmb3IgdG9kYXk6Cj4gCj4gRnJvbTogU3RlcGhlbiBSb3Rod2Vs bCA8c2ZyQGNhbmIuYXV1Zy5vcmcuYXU+Cj4gRGF0ZTogRnJpLCAyMSBBcHIgMjAxNyAxMjowNjoz MiArMTAwMAo+IFN1YmplY3Q6IFtQQVRDSF0gdGVlOiBtZXJnZSBmaXggZm9yIGRtYS1vcHMgZmll bGQgbmFtZSBjaGFuZ2VzCj4gCj4gU2lnbmVkLW9mZi1ieTogU3RlcGhlbiBSb3Rod2VsbCA8c2Zy QGNhbmIuYXV1Zy5vcmcuYXU+Cj4gLS0tCj4gIGRyaXZlcnMvdGVlL3RlZV9zaG0uYyB8IDQgKyst LQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL3RlZS90ZWVfc2htLmMgYi9kcml2ZXJzL3RlZS90ZWVfc2ht LmMKPiBpbmRleCAwYmUxZTNlOTNiZWUuLjRlMTRjOWM5Y2IxYyAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL3RlZS90ZWVfc2htLmMKPiArKysgYi9kcml2ZXJzL3RlZS90ZWVfc2htLmMKPiBAQCAtODQs OCArODQsOCBAQCBzdGF0aWMgc3RydWN0IGRtYV9idWZfb3BzIHRlZV9zaG1fZG1hX2J1Zl9vcHMg PSB7Cj4gIAkubWFwX2RtYV9idWYgPSB0ZWVfc2htX29wX21hcF9kbWFfYnVmLAo+ICAJLnVubWFw X2RtYV9idWYgPSB0ZWVfc2htX29wX3VubWFwX2RtYV9idWYsCj4gIAkucmVsZWFzZSA9IHRlZV9z aG1fb3BfcmVsZWFzZSwKPiAtCS5rbWFwX2F0b21pYyA9IHRlZV9zaG1fb3Bfa21hcF9hdG9taWMs Cj4gLQkua21hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiArCS5tYXBfYXRvbWljID0gdGVlX3NobV9v cF9rbWFwX2F0b21pYywKPiArCS5tYXAgPSB0ZWVfc2htX29wX2ttYXAsCj4gIAkubW1hcCA9IHRl ZV9zaG1fb3BfbW1hcCwKPiAgfTsKPiAgCj4gLS0gCj4gMi4xMS4wCgpUaGlzIGZpeHVwIGlzIG5v dyBuZWVkZWQgd2hlbiBtZXJnaW5nIHRoZSBhcm0tc29jIHRyZWUgd2l0aCBMaW51cycgdHJlZS4K LS0gCkNoZWVycywKU3RlcGhlbiBSb3Rod2VsbApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 From: sfr@canb.auug.org.au (Stephen Rothwell) Date: Thu, 4 May 2017 09:50: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: <20170504095012.2c109448@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 fixup is now needed when merging the arm-soc tree with Linus' tree. -- Cheers, Stephen Rothwell