* sm8250/lineage-20:
UPSTREAM: mm/vmalloc: Avoid rare case of flushing TLB with weird arguments
UPSTREAM: mm/vmalloc: Fix calculation of direct map addr range
UPSTREAM: proc: use kvzalloc for our kernel buffer
BACKPORT: FROMGIT: binder: fix freeze race
BACKPORT: binder: tell userspace to dump current backtrace when detected oneway spamming
BACKPORT: FROMGIT: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
BACKPORT: FROMGIT: binder: BINDER_GET_FROZEN_INFO ioctl
BACKPORT: FROMGIT: binder: BINDER_FREEZE ioctl
UPSTREAM: binder: add flag to clear buffer on txn complete
sdcardfs: Remove inclusion of uapi/linux/mount.h
ANDROID: sdcardfs: Add sdcardfs filesystem
fs: Drop current sdcardfs to prepare for new sdcardfs import
ANDROID: mnt: Add filesystem private data to mount points (v2)
namespace: take lock_mount_hash() directly when changing flags
ANDROID: Add show_options2 to view private mount data
UPSTREAM: mm: remove vmalloc_user_node_flags
UPSTREAM: mm: remove __vmalloc_node_flags_caller
UPSTREAM: mm/vmalloc: pass VM_USERMAP flags directly to __vmalloc_node_range()
UPSTREAM: mm/vmalloc.c: make vmalloc_32_user() align base kernel virtual address to SHMLBA
UPSTREAM: mm: remove both instances of __vmalloc_node_flags
...
Conflicts:
drivers/android/binder.c
include/uapi/linux/android/binder.h
Change-Id: Iddc89d4c0258dc4a4121fdffc097d9127c977a76
Michael Bestas
a9b31c784a