From patchwork Fri Jun 24 04:09:54 2022
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: 12893625
Return-Path: <kvm-owner@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 38B76C433EF
	for <kvm@archiver.kernel.org>; Fri, 24 Jun 2022 04:10:06 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229861AbiFXEKE (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Fri, 24 Jun 2022 00:10:04 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51090 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229607AbiFXEKD (ORCPT <rfc822;kvm@vger.kernel.org>);
        Fri, 24 Jun 2022 00:10:03 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48E7C68036;
        Thu, 23 Jun 2022 21:10:01 -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 4LTkD40yFcz4xD9;
        Fri, 24 Jun 2022 14:09:55 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1656043796;
        bh=NO6gwIyi/Vom9COuKpinlF5k4tXD56005MmLKL+dN0w=;
        h=Date:From:To:Cc:Subject:From;
        b=JVh5a8t9/x+kX7/oKEJgu218npZY2vlU8FcmMgsl2yzwKXTHW7uQTJK7PHrvOoDT0
         lOcyXInjOfINvyM/ilnPlglkgs6gEqOhnN0AY/ZmWz4C6KHTtnsPbrYIIegH7dXVee
         OhtdT7zzbNDvYqUFZyvSVR5Ermt9weHR/2aVQYzuaxEag1wz1sFczP9Zaz7XroHsY+
         MsGFWgbGR4oHQri6MQK5odLARKZeur6ifUq7Rf7rmwHCgZ/lR3jeaY1b1qC0enOuT8
         OEbDSNETTh4p22X639ih6YwwEE41/AGrig45sCoTGSam9aZWQCYNsSi7UdZtTcfEZo
         GQgXcCYI50yqg==
Date: Fri, 24 Jun 2022 14:09:54 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Guo Zhengkui <guozhengkui@vivo.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Raghavendra Rao Ananta <rananta@google.com>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree
Message-ID: <20220624140954.2ff3de30@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 tree got a conflict in:

  tools/testing/selftests/kvm/lib/aarch64/ucall.c

between commit:

  9e2f6498efbb ("selftests: KVM: Handle compiler optimizations in ucall")

from the kvm-fixes tree and commit:

  5d9cd8b55cdc ("selftests: kvm: replace ternary operator with min()")

from the kvm 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 tools/testing/selftests/kvm/lib/aarch64/ucall.c
index be1d9728c4ce,0b949ee06b5e..000000000000
--- a/tools/testing/selftests/kvm/lib/aarch64/ucall.c