Re: fastpath_t? __no_kcsan? Both?

2020-06-15 Thread Paul E. McKenney
On Mon, Jun 15, 2020 at 09:12:56AM +0200, Paolo Bonzini wrote: > On 15/06/20 06:20, Paul E. McKenney wrote: > > > > I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm: > > Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1: > > > > <<< 6c410247efb2d3907b508a2448ab9ab1c86d938c > >

Re: fastpath_t? __no_kcsan? Both?

2020-06-15 Thread Paolo Bonzini
On 15/06/20 06:20, Paul E. McKenney wrote: > > I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm: > Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1: > > <<< 6c410247efb2d3907b508a2448ab9ab1c86d938c > static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) > === > static __n

fastpath_t? __no_kcsan? Both?

2020-06-14 Thread Paul E. McKenney
Hello! I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm: Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1: <<< 6c410247efb2d3907b508a2448ab9ab1c86d938c static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) === static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu) >>>