Merge 0d5ec791 ("Merge tag 'char-misc-6.17-rc1' of...
Merge 0d5ec791 ("Merge tag 'char-misc-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc" ) into android-mainline Steps on the way to v6.17-rc1 Resolves merge conflicts in: drivers/android/Makefile drivers/android/binder.c Cc: Tiffany Yang <ynaffit@google.com> Change-Id: Ie1e76dbff7a10ca1b8079f48ba2c1b5afee273cc Signed-off-by:Carlos Llamas <cmllamas@google.com>
Loading