[PATCH 5.15 0/2] Fix kvm selftest build failures in linux-5.15.y