I recently went through the Android AOSP common tree and cherry-picked out a number of changes that haven't yet been submitted upstream.
I wanted to send them out for comment and potential merging for 3.15 via staging-next. Few minor notes: * The first patch in the series (binder: Fix death notifications) could potentially be merged in 3.14 as a fix. * The binder ABI change patch had a large number of checkpatch warnings for columns over 80 chars. I've fixed most of them, but the remaining are all strings, which I don't have a good sense of how to best address (splitting the string also give warnings). * The only other unaddressed checkpatch issue is: WARNING: __packed is preferred over __attribute__((packed)) But I'm hesitant to change that as this is a uapi .h file and I'm not sure if __packed is defined in userspace. * The last patch isn't yet submitted to AOSP, but it seemed obvious enough and if there's no objections I'll submit it shortly. Comments, thoughts, suggestions? thanks -john Cc: Greg KH <gre...@linuxfoundation.org> Cc: Colin Cross <ccr...@android.com> Cc: Arve Hjønnevåg <a...@android.com> Cc: Android Kernel Team <kernel-t...@android.com> Arve Hjønnevåg (2): staging: binder: Fix death notifications staging: binder: Support concurrent 32 bit and 64 bit processes. Colin Cross (5): staging: android: Split uapi out of android_alarm.h staging: android: Split uapi out of ashmem.h staging: android: split uapi out of sync.h and sw_sync.h staging: android: Split uapi out of binder.h staging: ion: Move shrinker out of heaps John Stultz (1): staging: binder: Improve Kconfig entry for ANDROID_BINDER_IPC_32BIT Laura Abbott (1): staging: ion: Fix debugfs handling of multiple kernel clients Mitchel Humpherys (4): staging: ion: Create separate heap and client debugfs directories staging: ion: Store a copy of the client name on client creation staging: ion: Make sure all clients are exposed in debugfs staging: ion: Add private buffer flag to skip page pooling on free Serban Constantinescu (1): staging: binder: Fix ABI for 64bit Android drivers/staging/android/Kconfig | 13 + drivers/staging/android/android_alarm.h | 44 +--- drivers/staging/android/ashmem.h | 30 +-- drivers/staging/android/binder.c | 271 +++++++++++--------- drivers/staging/android/binder.h | 308 +--------------------- drivers/staging/android/binder_trace.h | 14 +- drivers/staging/android/ion/ion.c | 121 +++++++-- drivers/staging/android/ion/ion_heap.c | 65 ++++- drivers/staging/android/ion/ion_page_pool.c | 8 +- drivers/staging/android/ion/ion_priv.h | 63 ++++- drivers/staging/android/ion/ion_system_heap.c | 84 ++---- drivers/staging/android/sw_sync.h | 20 +- drivers/staging/android/sync.h | 86 +------ drivers/staging/android/uapi/android_alarm.h | 62 +++++ drivers/staging/android/uapi/ashmem.h | 47 ++++ drivers/staging/android/uapi/binder.h | 351 ++++++++++++++++++++++++++ drivers/staging/android/uapi/sw_sync.h | 32 +++ drivers/staging/android/uapi/sync.h | 97 +++++++ 18 files changed, 1014 insertions(+), 702 deletions(-) create mode 100644 drivers/staging/android/uapi/android_alarm.h create mode 100644 drivers/staging/android/uapi/ashmem.h create mode 100644 drivers/staging/android/uapi/binder.h create mode 100644 drivers/staging/android/uapi/sw_sync.h create mode 100644 drivers/staging/android/uapi/sync.h -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
