From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Borntraeger <borntraeger@de•ibm.com>,
Cornelia Huck <cornelia.huck@de•ibm.com>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>, KVM <kvm@vger•kernel.org>
Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree
Date: Mon, 3 Jul 2017 11:55:42 +1000 [thread overview]
Message-ID: <20170703115542.4b95127f@canb.auug.org.au> (raw)
In-Reply-To: <20170622125928.76918255@canb.auug.org.au>
Hi all,
[cc'ing kvm tree maintainers]
Withe the merge window opening, just a reminder that this conflict
still exists.
On Thu, 22 Jun 2017 12:59:28 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/kvm/gaccess.c
>
> between commit:
>
> a75259825401 ("s390: rename struct psw_bits members")
>
> from the s390 tree and commit:
>
> 8993df124642 ("KVM: s390: implement instruction execution protection for emulated")
>
> from the kvms390 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/s390/kvm/gaccess.c
> index e0f7d5fc7efd,6fda095f1a99..000000000000
> --- a/arch/s390/kvm/gaccess.c
> +++ b/arch/s390/kvm/gaccess.c
> @@@ -790,8 -808,8 +808,8 @@@ static int guest_page_range(struct kvm_
> return trans_exc(vcpu, PGM_PROTECTION, ga, ar, mode,
> PROT_TYPE_LA);
> ga &= PAGE_MASK;
> - if (psw_bits(*psw).t) {
> + if (psw_bits(*psw).dat) {
> - rc = guest_translate(vcpu, ga, pages, asce, mode);
> + rc = guest_translate(vcpu, ga, pages, asce, mode, &prot);
> if (rc < 0)
> return rc;
> } else {
> @@@ -899,10 -918,10 +918,10 @@@ int guest_translate_address(struct kvm_
> mode, PROT_TYPE_LA);
> }
>
> - if (psw_bits(*psw).t && !asce.r) { /* Use DAT? */
> + if (psw_bits(*psw).dat && !asce.r) { /* Use DAT? */
> - rc = guest_translate(vcpu, gva, gpa, asce, mode);
> + rc = guest_translate(vcpu, gva, gpa, asce, mode, &prot);
> if (rc > 0)
> - return trans_exc(vcpu, rc, gva, 0, mode, PROT_TYPE_DAT);
> + return trans_exc(vcpu, rc, gva, 0, mode, prot);
> } else {
> *gpa = kvm_s390_real_to_abs(vcpu, gva);
> if (kvm_is_error_gpa(vcpu->kvm, *gpa))
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-07-03 1:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 2:59 linux-next: manual merge of the kvms390 tree with the s390 tree Stephen Rothwell
2017-07-03 1:55 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-23 1:12 Stephen Rothwell
2023-01-23 7:07 ` Christian Borntraeger
2023-01-23 19:02 ` Anthony Krowiak
2023-01-24 11:19 ` Christian Borntraeger
2023-01-24 14:43 ` Anthony Krowiak
2022-11-08 2:41 Stephen Rothwell
2017-04-27 3:29 Stephen Rothwell
2017-04-27 6:47 ` Christian Borntraeger
2016-11-23 3:45 Stephen Rothwell
2016-11-23 8:24 ` Christian Borntraeger
2016-11-23 9:17 ` Heiko Carstens
2016-06-14 4:51 Stephen Rothwell
2016-06-14 4:52 ` Heiko Carstens
2016-06-14 8:45 ` Christian Borntraeger
2015-07-22 2:31 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=20170703115542.4b95127f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=cornelia.huck@de$(echo .)ibm.com \
--cc=gleb@kernel$(echo .)org \
--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=mtosatti@redhat$(echo .)com \
--cc=schwidefsky@de$(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