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

Merge 228dfe98a3 ("Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline

Browse Source 
Steps on the way to 6.0-rc1

Resolves merge conflicts in:
	drivers/android/Kconfig
	drivers/android/binder.c
	drivers/misc/Makefile

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ied4316f324d592bf13d257871d9a27114a59f783
This commit is contained in:
Greg Kroah-Hartman
2022-08-12 14:54:33 +02:00
parent dccd5d2cf7 228dfe98a3
commit a4f98a7ebd
707 changed files with 184550 additions and 11933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/linux/android/binder.h
+1
View File
@@ -335,6 +335,7 @@ enum transaction_flags {
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 */
TF_UPDATE_TXN = 0x40, /* update the outdated pending async txn */
};
struct binder_transaction_data {