Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbdG1L4R (ORCPT ); Fri, 28 Jul 2017 07:56:17 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:36610 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbdG1L4P (ORCPT ); Fri, 28 Jul 2017 07:56:15 -0400 From: Martijn Coenen To: gregkh@linuxfoundation.org, john.stultz@linaro.org, tkjos@google.com, arve@android.com, amit.pundir@linaro.org Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, maco@google.com, Martijn Coenen Subject: [PATCH 0/3] ANDROID: binder: reconcile with android common tree Date: Fri, 28 Jul 2017 13:56:05 +0200 Message-Id: <20170728115608.61306-1-maco@android.com> X-Mailer: git-send-email 2.14.0.rc0.400.g1c36432dff-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1105 Lines: 30 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