linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <CAK8P3a2h=DS=-xKc059YQg=K400kRUHHpJ=xyDPRW40D3ZsaTQ@mail.gmail.com>
Date:   Fri, 8 Oct 2021 10:28:43 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>, 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: Re: linux-next: manual merge of the kvm tree with the asm-generic tree

On Fri, Oct 8, 2021 at 4:17 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> 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.

Looks good, thanks!

I'm planning to send the commit in the asm-generic tree to mainline
today, so it will then be a conflict against 5.15.

       Arnd