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

Hi all, On Thu, 30 Jul 2020 19:16:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the hmm tree got a conflict in: > > arch/powerpc/kvm/book3s_hv_uvmem.c > > between commit: > > f1b87ea8784b ("KVM: PPC: Book3S HV: Move kvmppc_svm_page_out up") > > from the kvm-ppc tree an

linux-next: manual merge of the hmm tree with the kvm-ppc tree

Hi all, Today's linux-next merge of the hmm tree got a conflict in: arch/powerpc/kvm/book3s_hv_uvmem.c between commit: f1b87ea8784b ("KVM: PPC: Book3S HV: Move kvmppc_svm_page_out up") from the kvm-ppc tree and commit: 5143192cd410 ("mm/migrate: add a flags parameter to migrate_vma") f