| Message ID | 20200529164613.526f5865@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with the s390 tree | expand |
Hi all, On Fri, 29 May 2020 16:46:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/s390/kvm/vsie.c > > between commit: > > 0b0ed657fe00 ("s390: remove critical section cleanup from entry.S") > > from the s390 tree and commit: > > d075fc3154be ("KVM: s390: vsie: Move conditional reschedule") > > from the kvm tree. > > diff --cc arch/s390/kvm/vsie.c > index 4fde24a1856e,ef05b4e167fb..000000000000 > --- a/arch/s390/kvm/vsie.c > +++ b/arch/s390/kvm/vsie.c > @@@ -1000,9 -1000,9 +1000,6 @@@ static int do_vsie_run(struct kvm_vcpu > > handle_last_fault(vcpu, vsie_page); > > - if (need_resched()) > - schedule(); > - if (test_cpu_flag(CIF_MCCK_PENDING)) > - s390_handle_mcck(); > -- > srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx); > > /* save current guest state of bp isolation override */ This is now a conflict between the s390 tree and Linus' tree.
diff --cc arch/s390/kvm/vsie.c index 4fde24a1856e,ef05b4e167fb..000000000000 --- a/arch/s390/kvm/vsie.c
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/s390/kvm/vsie.c between commit: 0b0ed657fe00 ("s390: remove critical section cleanup from entry.S") from the s390 tree and commit: d075fc3154be ("KVM: s390: vsie: Move conditional reschedule") from the kvm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.