github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
bbf615b8e1
linux/drivers/android
History
Greg Kroah-Hartman bbf615b8e1 Merge 7d6beb71da ("Merge tag 'idmapped-mounts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux") into android-mainline 
Steps on the way to 5.12-rc1.

Resolves conflicts in:
	fs/overlayfs/inode.c

Note, incfs is broken here, will mark it as BROKEN in another patch to
make it more obvious.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I95a5938fc3cfa27d521c5d4fd18b2adfb13a6d84
2021-03-06 17:42:01 +01:00
..
binder_alloc_selftest.c binder: print warnings when detecting oneway spamming. 2020-09-03 18:24:41 +02:00
binder_alloc.c binder: add flag to clear buffer on txn complete 2020-12-09 15:41:21 +01:00
binder_alloc.h binder: add flag to clear buffer on txn complete 2020-12-09 15:41:21 +01:00
binder_internal.h 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 2020-12-17 12:56:04 +01:00
binder_trace.h 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 2020-12-17 12:56:04 +01:00
binder.c ANDROID: binder: fix up use of MAX_USER_RT_PRIO 2021-03-03 15:29:48 +01:00
binderfs.c fs: make helpers idmap mount aware 2021-01-24 14:27:20 +01:00
Kconfig Revert "ANDROID: disable ANDROID_VENDOR_HOOKS" 2020-10-21 17:41:18 +00:00
Makefile ANDROID: add support for vendor hooks 2020-05-12 19:47:44 +00:00
vendor_hooks.c ANDROID: scsi: ufs: replace fill_prdt with Android vendor hook 2021-03-04 23:20:36 +00:00