From patchwork Fri Jun 25 05:24:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12343617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B8B4C48BC2 for ; Fri, 25 Jun 2021 05:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01B6861421 for ; Fri, 25 Jun 2021 05:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233148AbhFYF0g (ORCPT ); Fri, 25 Jun 2021 01:26:36 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:55485 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233133AbhFYF0f (ORCPT ); Fri, 25 Jun 2021 01:26:35 -0400 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 4GB55n6sXKz9sT6; Fri, 25 Jun 2021 15:24:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624598654; bh=Zp3z90qF7a58nx5/paNfizx5wb5txzLsiWbTxfjPssc=; h=Date:From:To:Cc:Subject:From; b=iFavLbji2HMdUGx1o3Fmi0LENvDUQFTJHzwBrUVG9KT4Cf8vQjQmCrZJnzLpc0DBX zW3pKzxBBAx3arBQAegX+om1ld+FYA1Y/z4X/tjMAOa5WdLjDXa+ZE4DHEku0Mvoqv 9qwyv1KX+UUBmJVdHa+Y6H7Hrv4oux0EtInM8ZOUbNgPmLl8odSuxV0feW4JEakkp1 UhPKCyqJXOg+B4uUc5hn4iOdb8VcQPQO+BRplt19GZucDLuX9ALYBKTuUWk2vCARLm ffEGXxwnpYETBapWnBCgVijhIGbBYAPnVGMs1OouQQAhx4GkEykDZlmj4zNvjNMOGT WKERZ0w2Rq2+A== Date: Fri, 25 Jun 2021 15:24:12 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini , KVM Cc: Linux Kernel Mailing List , Linux Next Mailing List , Ricardo Koller , Sean Christopherson Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20210625152412.11924d50@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: 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/include/x86_64/processor.h between commit: ef6a74b2e55e ("KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updates") from the kvm tree and commit: 75275d7fbef4 ("KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector reporting") 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 tools/testing/selftests/kvm/include/x86_64/processor.h index 6d27a5435971,92a62c6999bc..000000000000 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h