lkml.org 
[lkml]   [2020]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the kvm tree with the s390 tree
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.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-06-04 05:05    [W:1.147 / U:2.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site