From patchwork Mon Jul 18 05:19:30 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: 12920730
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 7F75CC43334
	for <kvm@archiver.kernel.org>; Mon, 18 Jul 2022 05:19:38 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233276AbiGRFTh (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Mon, 18 Jul 2022 01:19:37 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40106 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229680AbiGRFTf (ORCPT <rfc822;kvm@vger.kernel.org>);
        Mon, 18 Jul 2022 01:19:35 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADACC6323;
        Sun, 17 Jul 2022 22:19:33 -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 4LmVdH5dVyz4xbm;
        Mon, 18 Jul 2022 15:19:31 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1658121572;
        bh=B7cpHjbt5kcRv7FMz00EwdlkBbUF2kDdSz8ilusmmfg=;
        h=Date:From:To:Cc:Subject:From;
        b=haMct5wFAsJuiog/mdopFUDOhVUSoPypTiwnZyMi9C5NP4iMucfGf213TB3DLitdq
         WwJNLA8giKDRAZWsa5Hf4vQySnvtuPkJ4OSMxcLRt3SuCRvNeNl4XwUtQUXFRaOF5y
         RG1G15RxeJ9XlpXrbJ5IubSHYhqFx1/ovnw93c+FrBuHFEXhPcdAO5tQs9qv4+Uz0+
         rHV/NI5+3q2F/gYJbDAKD9Qyr/KXOaJ36LvO1ZRCngn11NtwLfSvv+VSFzeY3Nu8SZ
         GKNVB0KmPayU5t3HzIHfQaob1ljqL55do+v5DMrICA70KKmDoSMwKyvboKOngDcEI+
         i9wjjbIJowkfg==
Date: Mon, 18 Jul 2022 15:19:30 +1000
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>,
        Sean Christopherson <seanjc@google.com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Message-ID: <20220718151930.42ae670f@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:

  tools/testing/selftests/kvm/aarch64/vgic_init.c

between commits:

  98f94ce42ac6 ("KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper")
  7ed397d107d4 ("KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste")

from the kvm tree and commit:

  6a4f7fcd7504 ("KVM: arm64: selftests: Add support for GICv2 on v3")

from the kvm-arm tree.

I fixed it up (I think, 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/aarch64/vgic_init.c
index e8cab9840aa3,21ba4002fc18..000000000000
--- a/tools/testing/selftests/kvm/aarch64/vgic_init.c