[GIT,PULL] : few dma-buf updates for 3.20-rc1
Message ID | CAO_48GGT6C8-7gnKMcQ+rAQfvkEmyNzUmJAB=uJUJrFZSNo5sg@mail.gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1YOqQy-0000nS-4H; Fri, 20 Feb 2015 17:28:08 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1YOqQu-0000Sa-lV; Fri, 20 Feb 2015 17:28:06 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755308AbbBTQ1d (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 20 Feb 2015 11:27:33 -0500 Received: from mail-ob0-f176.google.com ([209.85.214.176]:47905 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754246AbbBTQ1c convert rfc822-to-8bit (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 20 Feb 2015 11:27:32 -0500 Received: by mail-ob0-f176.google.com with SMTP id wo20so25171607obc.7 for <linux-media@vger.kernel.org>; Fri, 20 Feb 2015 08:27:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc :content-type:content-transfer-encoding; bh=/BJ3TvHWgEXMwFUIbE+uvwJzwi6EdfEDXNP2ysbkXcc=; b=TdgBhb3OKe8nnBIGmFoLz1Bcpv4nCOjvkAo1JQhNfNqQMUqG9d7XUsMZYUXmnngsFJ TvbbZw0NbVg1+WUjEoEa0L8aPWXt1zL1Ku4E+ywoMni4hCy5Nq/FoYc/7KsePoK8so6g a+Q/sOpMI/FzkrHnhGSxsPTjn2Sxf16OKPv3VhxBjypW4IAU2CPbqU0WD8XJ9pvmGFv+ EzZp5QKyBWSIFZHP/1hX6R5K4WM2WTDjPIFphBivMS9x+a+fEGEumrV2losQpqDYRRSy +ivOKqKVNMucm0+bIyVI8mc+MrbPvc/wythCpKHlI5ykUtNFR5G4Q8zvWKqhtY7cVyhe dyqg== X-Gm-Message-State: ALoCoQljAw0Z+oa8ZqTpbW8SdBhINNROvMJTHDJ0MCJj6u3AlyKxpzvjZIKK4sup7aw1UYb1eiXD X-Received: by 10.60.73.103 with SMTP id k7mr7032089oev.38.1424449651878; Fri, 20 Feb 2015 08:27:31 -0800 (PST) MIME-Version: 1.0 Received: by 10.182.152.1 with HTTP; Fri, 20 Feb 2015 08:27:11 -0800 (PST) From: Sumit Semwal <sumit.semwal@linaro.org> Date: Fri, 20 Feb 2015 21:57:11 +0530 Message-ID: <CAO_48GGT6C8-7gnKMcQ+rAQfvkEmyNzUmJAB=uJUJrFZSNo5sg@mail.gmail.com> Subject: [GIT PULL]: few dma-buf updates for 3.20-rc1 To: Linus Torvalds <torvalds@linux-foundation.org>, LKML <linux-kernel@vger.kernel.org>, DRI mailing list <dri-devel@lists.freedesktop.org>, Linaro MM SIG <linaro-mm-sig@lists.linaro.org>, "linux-media@vger.kernel.org" <linux-media@vger.kernel.org> Cc: Tom Gall <tom.gall@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.2.20.161819 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' |
Pull-request
git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf.gitMessage
Sumit Semwal
Feb. 20, 2015, 4:27 p.m. UTC
Hi Linus, Could you please pull a few dma-buf changes for 3.20-rc1? Nothing fancy, minor cleanups. The following changes since commit b942c653ae265abbd31032f3b4f5f857e5c7c723: Merge tag 'trace-sh-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2015-01-22 06:26:07 +1200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf.git tags/dma-buf-for-3.20 for you to fetch changes up to 817bd7253291fc69d83d4340a7e186f3e6933169: dma-buf: cleanup dma_buf_export() to make it easily extensible (2015-02-18 20:16:20 +0530) ---------------------------------------------------------------- dma-buf pull request for 3.20 - minor timeout & other cleanups on reservation/fence - cleanup of dma_buf_export() ---------------------------------------------------------------- Jammy Zhou (2): reservation: wait only with non-zero timeout specified (v3) dma-buf/fence: don't wait when specified timeout is zero Michel Dänzer (1): reservation: Remove shadowing local variable 'ret' Sumit Semwal (1): dma-buf: cleanup dma_buf_export() to make it easily extensible Documentation/dma-buf-sharing.txt | 23 +++++++------ drivers/dma-buf/dma-buf.c | 47 ++++++++++++-------------- drivers/dma-buf/fence.c | 3 ++ drivers/dma-buf/reservation.c | 5 +-- drivers/gpu/drm/armada/armada_gem.c | 10 ++++-- drivers/gpu/drm/drm_prime.c | 12 ++++--- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++-- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++-- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++- drivers/gpu/drm/tegra/gem.c | 10 ++++-- drivers/gpu/drm/ttm/ttm_object.c | 9 +++-- drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++- drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++- drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++- drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++- drivers/staging/android/ion/ion.c | 9 +++-- include/linux/dma-buf.h | 34 +++++++++++++++---- 17 files changed, 158 insertions(+), 65 deletions(-) Thanks, and best regards, Sumit. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
On Fri, Feb 20, 2015 at 8:27 AM, Sumit Semwal <sumit.semwal@linaro.org> wrote: > > Could you please pull a few dma-buf changes for 3.20-rc1? Nothing > fancy, minor cleanups. No. I pulled, and immediately unpulled again. This is complete shit, and the compiler even tells you so: drivers/staging/android/ion/ion.c: In function ‘ion_share_dma_buf’: drivers/staging/android/ion/ion.c:1112:24: warning: ‘buffer’ is used uninitialized in this function [-Wuninitialized] exp_info.size = buffer->size; ^ Introduced by "dma-buf: cleanup dma_buf_export() to make it easily extensible". I'm not taking "cleanups" like this. And I certainly don't appreciate being sent completely bogus shit pull requests at the end of the merge cycle. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Linus, On 22 February 2015 at 01:42, Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Fri, Feb 20, 2015 at 8:27 AM, Sumit Semwal <sumit.semwal@linaro.org> wrote: >> >> Could you please pull a few dma-buf changes for 3.20-rc1? Nothing >> fancy, minor cleanups. > > No. > > I pulled, and immediately unpulled again. > > This is complete shit, and the compiler even tells you so: > > drivers/staging/android/ion/ion.c: In function ‘ion_share_dma_buf’: > drivers/staging/android/ion/ion.c:1112:24: warning: ‘buffer’ is > used uninitialized in this function [-Wuninitialized] > exp_info.size = buffer->size; > ^ > > Introduced by "dma-buf: cleanup dma_buf_export() to make it easily extensible". > > I'm not taking "cleanups" like this. And I certainly don't appreciate > being sent completely bogus shit pull requests at the end of the merge > cycle. I apologize sincerely; I shouldn't have missed it before sending you the pull request. (stupid copy-paste across files is certainly no excuse for this). This got caught in for-next too, but right after I sent the pull-request :(. I also shouldn't have sent it so late in the merge cycle - this could certainly wait till -rc2, which would've helped me correct it before the request to you. Serves me right to try and meet the merge-cycle deadline in a jet-lagged state! I will definitely take extra precautions next time onward, so you don't see negligence like this in my requests to you. Apologies again! > > Linus Best regards, Sumit. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html