Skip to content

Staging fixes from the Android tree (for 3.14)

John Stultz lkml 2 versions – Applied

Status from this message: I've applied the other 6 to my tree now, thanks.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest7 patches 3 repliesApplied
  2. v15 patches 10 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/7staging: sw_sync: Add stubs for kernels without CONFIG_SW_SYNCdrivers/staging/android/sw_sync.h+17 -00 replies
2/7staging: sync: Signal pt before sync_timeline object gets destroyeddrivers/staging/android/sync.c+4 -40 replies
3/7staging: sync: Fix a race condition between release_obj and print_objdrivers/staging/android/sync.c+3 -30 replies
4/7staging: ashmem: Avoid deadlock between read and mmap callsdrivers/staging/android/ashmem.c+26 -190 replies
5/7staging: ion: Fix overflow and list bugs in system heapdrivers/staging/android/ion/ion_system_heap.c+5 -10 replies
6/7staging: ion: Fix ION_IOC_FREE compat ioctldrivers/staging/android/ion/compat_ion.c+22 -40 replies
7/7staging: ion: Fix build warningdrivers/staging/android/ion/ion_priv.h+1 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCHv2 0/7] Staging fixes from the Android tree (for 3.14)

I recently went through the AOSP common.git android/3.10 tree to try to pull fixes that haven't been submitted upstream. I've cherry picked those patches and submitted them for 3.15, but Greg requested the bugfixes to be submitted by themselves for 3.14.

So here are the subset of changes that are bugfixes. There is one additional patch here which I missed in my last submission, but its a build warning fix, so I think its appropriate.

If and when these are merged, I'll resubmit the rest of the queue (which has grown further as of today) for 3.15.

Anyway, please let me know if there's any feedback or suggestions.

thanks
-john

Cc Greg KH <[email protected]>
Cc Colin Cross <[email protected]>
Cc Greg Hackmann <[email protected]>
Cc Prakash Kamliya <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Todd Poynor <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Android Kernel Team <[email protected]>

Alistair Strachan (1):
staging: sync: Fix a race condition between release_obj and print_obj

Colin Cross (1):
staging: ion: Fix overflow and list bugs in system heap

Greg Hackmann (1):
staging: sw_sync: Add stubs for kernels without CONFIG_SW_SYNC

John Stultz (1):
staging: ion: Fix build warning

Laura Abbott (1):
staging: ion: Fix ION_IOC_FREE compat ioctl

Prakash Kamliya (1):
staging: sync: Signal pt before sync_timeline object gets destroyed

Todd Poynor (1):
staging: ashmem: Avoid deadlock between read and mmap calls

 drivers/staging/android/ashmem.c              | 45 ++++++++++++++++-----------
 drivers/staging/android/ion/compat_ion.c      | 26 +++++++++++++---
 drivers/staging/android/ion/ion_priv.h        |  1 +
 drivers/staging/android/ion/ion_system_heap.c |  6 +++-
 drivers/staging/android/sw_sync.h             | 17 ++++++++++
 drivers/staging/android/sync.c                | 14 ++++-----
 6 files changed, 78 insertions(+), 31 deletions(-)
Signature · 1 line
1.8.3.2