Hi all,
On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> arch/arm/kvm/Kconfig
>
> between commit:
>
> 541ad0150ca4 ("arm: Remove 32bit KVM host support")
>
> from the kvm-arm tree and commit:
>
> ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
>
> from the vhost tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
^^^^^^^^^
I just removed the file, of course.
--
Cheers,
Stephen Rothwell
Attachment:
pgpIlksZIo9b1.pgp
Description: OpenPGP digital signature
