From patchwork Fri Oct  8 02:16:49 2021
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: 12544061
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 mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 042CBC433F5
	for <kvm@archiver.kernel.org>; Fri,  8 Oct 2021 02:16:57 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id D7B8160FD7
	for <kvm@archiver.kernel.org>; Fri,  8 Oct 2021 02:16:56 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S235472AbhJHCSu (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Thu, 7 Oct 2021 22:18:50 -0400
Received: from gandalf.ozlabs.org ([150.107.74.76]:57447 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235226AbhJHCSt (ORCPT <rfc822;kvm@vger.kernel.org>);
        Thu, 7 Oct 2021 22:18:49 -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 4HQWz73wKXz4xR9;
        Fri,  8 Oct 2021 13:16:51 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1633659413;
        bh=uAe3s4KDKeCI/VJ+ZcImRCB5utSt3BzwG7fBnqux3zo=;
        h=Date:From:To:Cc:Subject:From;
        b=lpNJi70m5v3oaQ94bBe4gUri1NVBnNIc3InT94xaBfH+pMEPviCe3p04LoC7yaVEl
         d4s42ZLfpbTSiDYPKp8/PbRAj+8DjBXTaS86w7XN2SWEU73HeYWckuWAg54J+pOKJf
         FUWhv2+oR7yWpwX3beUkDdWmPIjuz73rarBT3jbM83/gKZ9gOpHRyz/Fcm4WUFEnkT
         OoKH2cLRoVQ3dQqBoHEuZAEwd+d7JmztK3wM4CSgDt+lrs6iOap+120ll0+v7T6mc2
         ZOkjJVz8RJyNpsLfx5acu8B+54AFqPlYQaF09RZUDvUNzr7xvClJv+700PV5NtmSxx
         KExgesRfsV/kg==
Date: Fri, 8 Oct 2021 13:16:49 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        Arnd Bergmann <arnd@arndb.de>
Cc: Anup Patel <anup.patel@wdc.com>, Anup Patel <anup@brainfault.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kvm tree with the asm-generic tree
Message-ID: <20211008131649.01295541@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/Kconfig

between commit:

  b63dc8f2b02c ("firmware: include drivers/firmware/Kconfig unconditionally")

from the asm-generic tree and commit:

  99cdc6c18c2d ("RISC-V: Add initial skeletal KVM support")

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/Kconfig
index 0050a2adf67b,f5fe8a7f0e24..000000000000
--- a/arch/riscv/Kconfig