On 21/12/2017 03:45, Lan Tianyu wrote: > Hi Paolo: > Should we check input sregs before loading vcpu? If input sregs is > invalid, the operation is redundant.
That would be another way to fix the conflict. Note that the conflict is between two different trees (kvm/master and kvm/next), so in any case it will remain until the next merge window. Paolo
