From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035280AbdDUFEM (ORCPT ); Fri, 21 Apr 2017 01:04:12 -0400 Received: from ale.deltatee.com ([207.54.116.67]:34979 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035216AbdDUFD7 (ORCPT ); Fri, 21 Apr 2017 01:03:59 -0400 To: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , Olof Johansson , Arnd Bergmann , ARM References: <20170421121014.3ee14a83@canb.auug.org.au> Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Sumit Semwal , Jens Wiklander From: Logan Gunthorpe Message-ID: <3805ce0d-bb1a-03b5-3f8f-93043306fa82@deltatee.com> Date: Thu, 20 Apr 2017 23:03:42 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170421121014.3ee14a83@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 50.66.97.235 X-SA-Exim-Rcpt-To: jens.wiklander@linaro.org, sumit.semwal@linaro.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, sfr@canb.auug.org.au X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: linux-next: build failure after merge of the drm-misc tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks Stephen. Looks good to me. Logan On 20/04/17 08:10 PM, Stephen Rothwell wrote: > 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, > }; > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Logan Gunthorpe Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Thu, 20 Apr 2017 23:03:42 -0600 Message-ID: <3805ce0d-bb1a-03b5-3f8f-93043306fa82@deltatee.com> 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: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , Olof Johansson , Arnd Bergmann , ARM Cc: Jens Wiklander , Linux-Next Mailing List , Linux Kernel Mailing List , Sumit Semwal List-Id: linux-next.vger.kernel.org VGhhbmtzIFN0ZXBoZW4uIExvb2tzIGdvb2QgdG8gbWUuCgpMb2dhbgoKT24gMjAvMDQvMTcgMDg6 MTAgUE0sIFN0ZXBoZW4gUm90aHdlbGwgd3JvdGU6Cj4gSGkgYWxsLAo+IAo+IEFmdGVyIG1lcmdp bmcgdGhlIGRybS1taXNjIHRyZWUsIHRvZGF5J3MgbGludXgtbmV4dCBidWlsZCAoeDg2XzY0Cj4g YWxsbW9kY29uZmlnKSBmYWlsZWQgbGlrZSB0aGlzOgo+IAo+IGRyaXZlcnMvdGVlL3RlZV9zaG0u Yzo4NzoyOiBlcnJvcjogdW5rbm93biBmaWVsZCAna21hcF9hdG9taWMnIHNwZWNpZmllZCBpbiBp bml0aWFsaXplcgo+ICAgLmttYXBfYXRvbWljID0gdGVlX3NobV9vcF9rbWFwX2F0b21pYywKPiAg IF4KPiBkcml2ZXJzL3RlZS90ZWVfc2htLmM6ODc6MTc6IGVycm9yOiBpbml0aWFsaXphdGlvbiBm cm9tIGluY29tcGF0aWJsZSBwb2ludGVyIHR5cGUgWy1XZXJyb3I9aW5jb21wYXRpYmxlLXBvaW50 ZXItdHlwZXNdCj4gICAua21hcF9hdG9taWMgPSB0ZWVfc2htX29wX2ttYXBfYXRvbWljLAo+ICAg ICAgICAgICAgICAgICAgXgo+IGRyaXZlcnMvdGVlL3RlZV9zaG0uYzo4NzoxNzogbm90ZTogKG5l YXIgaW5pdGlhbGl6YXRpb24gZm9yICd0ZWVfc2htX2RtYV9idWZfb3BzLmJlZ2luX2NwdV9hY2Nl c3MnKQo+IGRyaXZlcnMvdGVlL3RlZV9zaG0uYzo4ODoyOiBlcnJvcjogdW5rbm93biBmaWVsZCAn a21hcCcgc3BlY2lmaWVkIGluIGluaXRpYWxpemVyCj4gICAua21hcCA9IHRlZV9zaG1fb3Bfa21h cCwKPiAgIF4KPiBkcml2ZXJzL3RlZS90ZWVfc2htLmM6ODg6MTA6IGVycm9yOiBpbml0aWFsaXph dGlvbiBmcm9tIGluY29tcGF0aWJsZSBwb2ludGVyIHR5cGUgWy1XZXJyb3I9aW5jb21wYXRpYmxl LXBvaW50ZXItdHlwZXNdCj4gICAua21hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiAgICAgICAgICAg Xgo+IGRyaXZlcnMvdGVlL3RlZV9zaG0uYzo4ODoxMDogbm90ZTogKG5lYXIgaW5pdGlhbGl6YXRp b24gZm9yICd0ZWVfc2htX2RtYV9idWZfb3BzLmVuZF9jcHVfYWNjZXNzJykKPiAKPiBDYXVzZWQg YnkgY29tbWl0Cj4gCj4gICBmOWI2N2YwMDE0Y2IgKCJkbWEtYnVmOiBSZW5hbWUgZG1hLW9wcyB0 byBwcmV2ZW50IGNvbmZsaWN0IHdpdGgga3VubWFwX2F0b21pYyBtYWNybyIpCj4gCj4gaW50ZXJh Y3Rpbmcgd2l0aCBjb21taXQKPiAKPiAgIDk2N2M5Y2NhMmNjNSAoInRlZTogZ2VuZXJpYyBURUUg c3Vic3lzdGVtIikKPiAKPiBmcm9tIHRoZSBhcm0tc29jIHRyZWUuCj4gCj4gSSBhcHBsaWVkIHRo ZSBmb2xsb3dpbmcgbWVyZ2UgZml4IHBhdGNoIGZvciB0b2RheToKPiAKPiBGcm9tOiBTdGVwaGVu IFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4KPiBEYXRlOiBGcmksIDIxIEFwciAyMDE3 IDEyOjA2OjMyICsxMDAwCj4gU3ViamVjdDogW1BBVENIXSB0ZWU6IG1lcmdlIGZpeCBmb3IgZG1h LW9wcyBmaWVsZCBuYW1lIGNoYW5nZXMKPiAKPiBTaWduZWQtb2ZmLWJ5OiBTdGVwaGVuIFJvdGh3 ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4KPiAtLS0KPiAgZHJpdmVycy90ZWUvdGVlX3NobS5j IHwgNCArKy0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdGVlL3RlZV9zaG0uYyBiL2RyaXZlcnMvdGVl L3RlZV9zaG0uYwo+IGluZGV4IDBiZTFlM2U5M2JlZS4uNGUxNGM5YzljYjFjIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvdGVlL3RlZV9zaG0uYwo+ICsrKyBiL2RyaXZlcnMvdGVlL3RlZV9zaG0uYwo+ IEBAIC04NCw4ICs4NCw4IEBAIHN0YXRpYyBzdHJ1Y3QgZG1hX2J1Zl9vcHMgdGVlX3NobV9kbWFf YnVmX29wcyA9IHsKPiAgCS5tYXBfZG1hX2J1ZiA9IHRlZV9zaG1fb3BfbWFwX2RtYV9idWYsCj4g IAkudW5tYXBfZG1hX2J1ZiA9IHRlZV9zaG1fb3BfdW5tYXBfZG1hX2J1ZiwKPiAgCS5yZWxlYXNl ID0gdGVlX3NobV9vcF9yZWxlYXNlLAo+IC0JLmttYXBfYXRvbWljID0gdGVlX3NobV9vcF9rbWFw X2F0b21pYywKPiAtCS5rbWFwID0gdGVlX3NobV9vcF9rbWFwLAo+ICsJLm1hcF9hdG9taWMgPSB0 ZWVfc2htX29wX2ttYXBfYXRvbWljLAo+ICsJLm1hcCA9IHRlZV9zaG1fb3Bfa21hcCwKPiAgCS5t bWFwID0gdGVlX3NobV9vcF9tbWFwLAo+ICB9Owo+ICAKPiAKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: logang@deltatee.com (Logan Gunthorpe) Date: Thu, 20 Apr 2017 23:03:42 -0600 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: <3805ce0d-bb1a-03b5-3f8f-93043306fa82@deltatee.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Thanks Stephen. Looks good to me. Logan On 20/04/17 08:10 PM, Stephen Rothwell wrote: > 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, > }; > >