[PATCH 0/3] ANDROID: binder: reconcile with android common tree

[Martijn Coenen <maco@android.com>]

When comparing the android common kernel branch with
upstream, I found several differences.

The "add padding" patch has long been applied in common,
and shipping versions of Android userspace depends on this
particular alignment; so while it does change UAPI, we
have never shipped a userspace that used the old UAPI,
so this change does not break anything.

The "add hwbinder,vndbinder" patch changes the default
binder device nodes to match what the latest Android
userspace (O) requires.

Finally, the recent patch-stack for fine-grained locking
contained a patch that for some reason was incomplete;
"fix proc->tsk check" addresses this particular problem.

Martijn Coenen (3):
  ANDROID: binder: add padding to binder_fd_array_object.
  ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
  ANDROID: binder: fix proc->tsk check.

 drivers/android/Kconfig             | 2 +-
 drivers/android/binder.c            | 2 +-
 include/uapi/linux/android/binder.h | 2 ++
 kernel/configs/android-base.config  | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

-- 
2.14.0.rc0.400.g1c36432dff-goog