Merge branch 'arm/queue' into 'master'

arm64: Fix for migrate skip

See merge request kvm-unit-tests/kvm-unit-tests!57
diff --git a/arm/gic.c b/arm/gic.c
index bbf828f..256dd80 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -829,6 +829,7 @@
 	if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) {
 		report_skip("Skipping test, as this test hangs without the fix. "
 			    "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS);
+		migrate_skip();
 		return;
 	}