tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2911ed9f47 ("Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mailine

Browse Source 
Steps on the way to 5.11-rc1

Fix up merge issues in:
	drivers/android/binder_internal.h
	drivers/android/binder.c

Cc: Alistair Strachan <astrachan@google.com>
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I34ac6b6a8028b0e63d419c66448ac1382711ec5e
This commit is contained in:
Greg Kroah-Hartman
2020-12-17 12:56:04 +01:00
parent f98aec4981 2911ed9f47
commit b1e6a98547
289 changed files with 23699 additions and 4154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/linux/android/binder.h
+1
View File
@@ -296,6 +296,7 @@ enum transaction_flags {
TF_ROOT_OBJECT = 0x04, /* contents are the component's root object */
TF_STATUS_CODE = 0x08, /* contents are a 32-bit status code */
TF_ACCEPT_FDS = 0x10, /* allow replies with file descriptors */
TF_CLEAR_BUF = 0x20, /* clear buffer on txn complete */
};
struct binder_transaction_data {