Greg Kroah-Hartman b1e6a98547 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 ...

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

2020-12-17 12:56:04 +01:00

..

binder.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

binderfs.h

binderfs: use __u32 for device numbers

2019-01-22 12:13:17 +01:00