So I've been able to get this working with the following patches (and notes about how I resolved the conflicts)
533558bcb69ef28aff81b6ae9acda8943575319f (remove vmx_leave_nested)
b6b8a1451fc40412c57d10c94b62e22acab28f94 (remove vmx_mpx_supported)
f4124500c2c13eb1208c6143b3f6d469709dea10 (remove VMX_MISC_ACTIVITY_HLT)
696dfd95ba9838327a7013e5988ff3ba60dcc8c8
So I've been able to get this working with the following patches (and notes about how I resolved the conflicts) aff81b6ae9acda8 943575319f (remove vmx_leave_nested) 2c57d10c94b62e2 2acab28f94 (remove vmx_mpx_supported) 1208c6143b3f6d4 69709dea10 (remove VMX_MISC_ ACTIVITY_ HLT) 27a7013e5988ff3 ba60dcc8c8
533558bcb69ef28
b6b8a1451fc4041
f4124500c2c13eb
696dfd95ba98383