From patchwork Mon Oct 10 01:31:11 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: 13002197
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 3306CC4332F
	for <kvm@archiver.kernel.org>; Mon, 10 Oct 2022 01:31:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230455AbiJJBbU (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Sun, 9 Oct 2022 21:31:20 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32906 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230142AbiJJBbT (ORCPT <rfc822;kvm@vger.kernel.org>);
        Sun, 9 Oct 2022 21:31:19 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD15D45059;
        Sun,  9 Oct 2022 18:31:17 -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 4Mm1b73HRRz4x1D;
        Mon, 10 Oct 2022 12:31:15 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1665365475;
        bh=cj/OupvxK+ninXY9OhqPvK9B+YFYEM0VDCh1CryGPRE=;
        h=Date:From:To:Cc:Subject:From;
        b=XWcMCySKsRrw+YO+VOLaq9LAxE9tT7sLJT0qhBirE30gbzdsm10ZchcogRhely9oG
         sDwMnPU19sFHnCQKb5C73lEXD0ce3bZ8Jp5HNrt574X2jlY1hoJGQ0ZO9IrSL+2Zjo
         aeUmW0EOYunhAiHUH/u9Hgc1gf+bh5Kp3juGVsChKYVFyuw7wV3pETNqfkTxNRvnZJ
         Bz/SH/SQCpN/ZGtThyXx5GRy7kobog8WHq3WZ+J20utx+vUoKL4ub1etb2dVjXgg1/
         fZejFqdh1r+MyXzuGA0gw0mruWxUkelQ+SVSi8MqRzyUK8ZYSsDJ4zuIFgbcGX6Fex
         dyCpgun7M9CRA==
Date: Mon, 10 Oct 2022 12:31:11 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Anup Patel <anup@brainfault.org>,
        Anup Patel <apatel@ventanamicro.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mayuresh Chitale <mchitale@ventanamicro.com>,
        Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the kvm tree with Linus' tree
Message-ID: <20221010123111.268dfe21@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:

  arch/riscv/kernel/cpu.c

between commit:

  61a41d16ad20 ("RISC-V: Print SSTC in canonical order")

from Linus' tree and commit:

  122979aa26cd ("RISC-V: Probe Svinval extension form ISA string")

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 arch/riscv/kernel/cpu.c
index 87455d12970f,7d1cd653ca02..000000000000
--- a/arch/riscv/kernel/cpu.c