From patchwork Fri Mar 31 02:26:25 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13195219
Return-Path: <kvm-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 89B1CC6FD1D
	for <kvm@archiver.kernel.org>; Fri, 31 Mar 2023 02:26:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229875AbjCaC0c (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Thu, 30 Mar 2023 22:26:32 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45658 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229500AbjCaC0b (ORCPT <rfc822;kvm@vger.kernel.org>);
        Thu, 30 Mar 2023 22:26:31 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3785BEB61;
        Thu, 30 Mar 2023 19:26:29 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4PnkgR5HmFz4xDr;
        Fri, 31 Mar 2023 13:26:27 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1680229588;
        bh=v3jndaBJ+HdzfcjpfsdHRytz1x5Dz2zRYXIwuA6OI5I=;
        h=Date:From:To:Cc:Subject:From;
        b=dyN2IEYv2kW4F2DocGDPpbkXi131tVrc6gMKZNx6ZQBLUuV2H7jdW+4osPy4MzOR+
         WgXrDV5PbX3XUitiL/r6zUcoI3Kp8h/0AX+Ixjj2CWlG2mN8iDNJDa9jBde/L/pEP2
         4pd4JTxrhZZFaK8e0gqG/ozSXUiaxCFUhYWJo+bFgoSCV4fD3HzbOqIQpwnDDBh18y
         WBl6bD9wSkbSV23anBDwaUeDoBK0/19OFrsCRMZIe+CFXlAfWnJfXaOEM2nMfhB4Rg
         DJZfUEwV2+MPLBP15s/abLRAcieL25zamicKkOVMByOYvMen53tSC5wj3REiIFA/Ee
         NVcZycODC2fqA==
Date: Fri, 31 Mar 2023 13:26:25 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoffer Dall <cdall@cs.columbia.edu>,
        Marc Zyngier <maz@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Huth <thuth@redhat.com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Message-ID: <20230331132625.4c8149ae@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm64/include/asm/kvm_host.h

between commit:

  2def950c63e3 ("KVM: arm64: Limit length in kvm_vm_ioctl_mte_copy_tags() to INT_MAX")

from the kvm tree and commit:

  30ec7997d175 ("KVM: arm64: timers: Allow userspace to set the global counter offset")

from the kvm-arm 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.

diff --cc arch/arm64/include/asm/kvm_host.h
index 6f7b218a681f,a8e2c52b44aa..000000000000
--- a/arch/arm64/include/asm/kvm_host.h