Merge c26f4fbd ("Merge tag 'char-misc-6.16-rc1' of...

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

) into android-mainline

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

Cc: Tiffany Y. Yang <ynaffit@google.com>
Change-Id: I17c50393269fe4b537e15d1a4a976b6bade935e7
Signed-off-by: Carlos Llamas <cmllamas@google.com>