diff --git a/[refs] b/[refs]
index 8ea227c5f236..bf2093f0fbd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2714d1d3d6be882b97cd0125140fccf9976a460a
+refs/heads/master: 7732a8d19bdc6ae18f68f9adb47d11c82a3a86cd
diff --git a/trunk/arch/s390/kvm/Kconfig b/trunk/arch/s390/kvm/Kconfig
index 2489b341a00b..1761b74d639b 100644
--- a/trunk/arch/s390/kvm/Kconfig
+++ b/trunk/arch/s390/kvm/Kconfig
@@ -36,6 +36,9 @@ config KVM
 
 	  If unsure, say N.
 
+config KVM_TRACE
+       bool
+
 # OK, it's a little counter-intuitive to do this, but it puts it neatly under
 # the virtualization menu.
 source drivers/virtio/Kconfig