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.
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
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’ isused 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.
linaro-mm-sig@lists.linaro.org
-
Linus Torvalds -
Sumit Semwal