Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Janosch Frank <frankja@linux.ibm.com>,
        Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jim Mattson <jmattson@google.com>
References: <20200713145007.26acf3fb@canb.auug.org.au>
From:   Collin Walling <walling@linux.ibm.com>
Message-ID: <067cf82f-cc6d-968a-d1ab-53edc4e44114@linux.ibm.com>
Date:   Wed, 15 Jul 2020 12:25:42 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.9.0
MIME-Version: 1.0
In-Reply-To: <20200713145007.26acf3fb@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 7/13/20 12:50 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>   include/uapi/linux/kvm.h
> 
> between commit:
> 
>   1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information")
> 
> from the kvm tree and commit:
> 
>   23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
> 
> 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.
> 

Much appreciated. This change is acceptable and should be properly
reflected in a header sync for QEMU (which I believe just copies the
files from the kernel?)

Thanks for the update.

-- 
Regards,
Collin

Stay safe and stay healthy