From patchwork Wed Jan 12 00:40:24 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: 12710848
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 7902DC433F5
	for <kvm@archiver.kernel.org>; Wed, 12 Jan 2022 00:40:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1347289AbiALAkc (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Tue, 11 Jan 2022 19:40:32 -0500
Received: from gandalf.ozlabs.org ([150.107.74.76]:33685 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234326AbiALAkb (ORCPT <rfc822;kvm@vger.kernel.org>);
        Tue, 11 Jan 2022 19:40:31 -0500
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 4JYTHX6nYqz4y41;
        Wed, 12 Jan 2022 11:40:24 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1641948029;
        bh=OKHUQyNaR3xR6APh61tWn+dSE3ThCx0C1NbFgssUJOo=;
        h=Date:From:To:Cc:Subject:From;
        b=bxDD0CMvsC14Kf5Ye+9a0teF0LfFJkkW/p6AE471U0tXoAnZ/0TWhnujYUWVZBwAL
         GBNz0W6Rm2Bta6zOUEA9qcnjufhkMjfcjkzDF7tgGx1wS1yoYVimpLLYIWDNqHdwAb
         qiOfMBNoq5IOJVhGzrGcaC/CkFH356CuJCTGM3mQBfUmrhvHmF7544U1iThM7zCxps
         izwSM4qlRAhU7BxEEtunbUByofSoAzj7vMTwN864Zg6NlK0OyGmoYKp8usLKD9/UEY
         h7qQeAShdty+k4rnOI2UBxi8hXToTj4zPX4XxQdQW0JI/13lU/dglMF6tf84/DUGwu
         TBbwocBk4X3Yg==
Date: Wed, 12 Jan 2022 11:40:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul@pwsan.com>
Cc: Anup Patel <anup.patel@wdc.com>, Anup Patel <anup@brainfault.org>,
        Atish Patra <atish.patra@wdc.com>,
        Atish Patra <atishp@atishpatra.org>,
        Atish Patra <atishp@rivosinc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the kvm tree with the risc-v tree
Message-ID: <20220112114024.7be8aac6@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/include/asm/sbi.h

between commit:

  b579dfe71a6a ("RISC-V: Use SBI SRST extension when available")

from the risc-v tree and commit:

  c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")

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/include/asm/sbi.h
index 289621da4a2a,9c46dd3ff4a2..000000000000
--- a/arch/riscv/include/asm/sbi.h