lkml.org 
[lkml]   [2020]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the vhost tree with the kvm-arm tree
From
Date

On 2020/3/30 下午1:57, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell<sfr@canb.auug.org.au> 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.


Hi Stephen:

If you meant arch/arm/kvm/Kconfig I think it's correct.

Thakns

\
 
 \ /
  Last update: 2020-03-30 09:09    [W:0.035 / U:0.508 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site