Merge 9cfd9c45 ("Merge tag 'char-misc-5.10-rc4' of...

Merge 9cfd9c45 ("Merge tag 'char-misc-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc"

) into android-mainline

Steps on the way to 5.10-rc4

Resolves conflict in:
	arch/arm64/kvm/sys_regs.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id188ccbec038cf7e30c204e9f5b7866f72b6640d