Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
kvm-stub.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kvm-stub.c b/kvm-stub.c
index caef9b4..fc2b810 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -137,7 +137,6 @@ int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr,
uint32_t val, bool assign)
return -ENOSYS;
}
-<<<<<<< HEAD
int kvm_has_gsi_routing(void)
{
return 0;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
