Re: linux-next: manual merge of the kvm tree with the rcu tree

Hi all, On Mon, 18 May 2020 15:42:40 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/x86/kvm/svm/svm.c > > between commit: > > 9f24847d8fdb ("kvm/svm: Disable KCSAN for svm_vcpu_run()") > > from the rcu tree and commits: > > a9ab

linux-next: manual merge of the kvm tree with the rcu tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/svm/svm.c between commit: 9f24847d8fdb ("kvm/svm: Disable KCSAN for svm_vcpu_run()") from the rcu tree and commits: a9ab13ff6e84 ("KVM: X86: Improve latency for single target IPI fastpath") 404d5d7bff0d (

linux-next: manual merge of the kvm tree with the rcu tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in arch/ia64/kvm/Kconfig between commit d80bd9c0e85f ("tinification: Make SRCU optional by using CONFIG_SRCU") from the rcu tree and commit 003f7de62589 ("KVM: ia64: remove") from the kvm tree. I fixed it up (I just removed the file)