Merge 2911ed9f ("Merge tag 'char-misc-5.11-rc1' of...

Merge 2911ed9f ("Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc"

) into android-mailine

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