Hi Martin, On Tue, 7 Jun 2016 15:07:55 +0200 Martin Schwidefsky <schwidefsky@xxxxxxxxxx> wrote: > > we got a report of a compile error due to a clash between the features branch > and the kvm branch for s390. Fixed with the following patch: > -- > From 39e60f02654946c40a3d2b78239316c431588145 Mon Sep 17 00:00:00 2001 > From: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> > Date: Tue, 7 Jun 2016 14:49:43 +0200 > Subject: [PATCH] s390: fix merge conflict in arch/s390/kvm/kvm-s390.c Thanks for the resolution, I will apply this when I merge the kvms390 tree today. Someone needs to remember to tell Linus when these two trees meet in his tree. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
