Bug fix

Author: softickllc

shim/linux/include/platform_interface/shim_platform_interface.hpp

@@ -31,11 +31,8 @@
 #include <kvm_cpuid2.hpp>
 #include <kvm_cpuid_entry2.hpp>
 #include <kvm_fpu.hpp>
-<<<<<<< HEAD
-#include <kvm_irqchip.hpp>
-=======
 #include <kvm_irq_routing.hpp>
->>>>>>> KVM_SET_GSI_ROUTING: Add scaffolding and initial integration tests
+#include <kvm_irqchip.hpp>
 #include <kvm_mp_state.hpp>
 #include <kvm_msr_entry.hpp>
 #include <kvm_msr_list.hpp>

shim/linux/src/entry.c

@@ -55,8 +55,8 @@
 #include <handle_vm_kvm_create_vcpu.h>
 #include <handle_vm_kvm_destroy_vcpu.h>
 #include <handle_vm_kvm_get_irqchip.h>
-#include <handle_vm_kvm_set_irqchip.h>
 #include <handle_vm_kvm_set_gsi_routing.h>
+#include <handle_vm_kvm_set_irqchip.h>
 #include <handle_vm_kvm_set_user_memory_region.h>
 #include <linux/anon_inodes.h>
 #include <linux/kernel.h>