linux-kernel - linux-next: manual merge of the kvm tree with the asm-generic tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211008131649.01295541@canb.auug.org.au>
Date:   Fri, 8 Oct 2021 13:16:49 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Anup Patel <anup.patel@....com>, Anup Patel <anup@...infault.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the kvm tree with the asm-generic tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 0050a2adf67b,f5fe8a7f0e24..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -562,3 -561,6 +562,5 @@@ menu "Power management options
  source "kernel/power/Kconfig"
  
  endmenu
+ 
+ source "arch/riscv/kvm/Kconfig"
 -source "drivers/firmware/Kconfig"

Content of type "application/pgp-signature" skipped