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

[Arnd Bergmann]

On Fri, Oct 8, 2021 at 4:17 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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