From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Hildenbrand <david@redhat•com>,
Sven Schnelle <svens@linux•ibm.com>
Subject: Re: linux-next: manual merge of the kvm tree with the s390 tree
Date: Thu, 4 Jun 2020 13:05:00 +1000 [thread overview]
Message-ID: <20200604130500.5b42014e@canb.auug.org.au> (raw)
In-Reply-To: <20200529164613.526f5865@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-06-04 3:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 6:46 linux-next: manual merge of the kvm tree with the s390 tree Stephen Rothwell
2020-06-04 3:05 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-14 4:03 Stephen Rothwell
2016-07-14 6:58 ` David Hildenbrand
2016-06-29 4:36 Stephen Rothwell
2016-06-29 5:47 ` Heiko Carstens
2014-10-07 4:59 Stephen Rothwell
2013-06-06 3:55 Stephen Rothwell
2013-01-03 1:06 Stephen Rothwell
2013-01-03 7:31 ` Martin Schwidefsky
2013-01-03 10:56 ` Stephen Rothwell
2012-08-16 3:49 Stephen Rothwell
2011-09-21 3:55 Stephen Rothwell
2010-10-21 1:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200604130500.5b42014e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=david@redhat$(echo .)com \
--cc=gor@linux$(echo .)ibm.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=svens@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox