Paolo, here is a fix of a "merge issue" breaking some kvm configurations on s390. since Martin is away this week, lets push this fix via your tree. (this has the additional advantage that this fix will probably be part of kvm/next, making 4.7 patch handling easier). Ok? Heiko, can you ack this fix? Christian Borntraeger (1): s390/mm/kvm: fix mis-merge in gmap handling arch/s390/mm/gmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.5.5 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html