Merge 10c95568 ("powerpc/pseries: Fix KVM guest detection for disabling...

Merge 10c95568 ("powerpc/pseries: Fix KVM guest detection for disabling hardlockup detector") into android15-6.6-lts

Steps on the way to 6.6.64

Resolves merge conflicts in:
	fs/f2fs/data.c

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