From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553AbdFVC7d (ORCPT ); Wed, 21 Jun 2017 22:59:33 -0400 Received: from ozlabs.org ([103.22.144.67]:56853 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752403AbdFVC7b (ORCPT ); Wed, 21 Jun 2017 22:59:31 -0400 Date: Thu, 22 Jun 2017 12:59:28 +1000 From: Stephen Rothwell To: Christian Borntraeger , Cornelia Huck , Martin Schwidefsky , Heiko Carstens Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the kvms390 tree with the s390 tree Message-ID: <20170622125928.76918255@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, 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))