Greg Kroah-Hartman a4f98a7ebd Merge 228dfe98a3 ("Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline ... Steps on the way to 6.0-rc1 Resolves merge conflicts in: drivers/android/Kconfig drivers/android/binder.c drivers/misc/Makefile Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ied4316f324d592bf13d257871d9a27114a59f783		2022-08-21 14:30:36 +02:00
..
binder.h	Merge 228dfe98a3 ("Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline	2022-08-21 14:30:36 +02:00
binderfs.h