lkml.org 
[lkml]   [2023]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the kvm-arm tree with the arm64 tree
On Tue, Oct 24, 2023 at 01:28:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kvm/mmu.c
>
> between commits:
>
> 0e0fb2f69c1b ("arm64: kvm: avoid CONFIG_PGTABLE_LEVELS for runtime levels")
> 8d35f7bcee55 ("arm64: kvm: Limit HYP VA and host S2 range to 48 bits when LPA2 is in effect")
>
> from the arm64 tree and commit:
>
> bf92834e6f6e ("KVM: arm64: Use folio for THP adjustment")
>
> from the kvm-arm tree.
>
> I fixed it up (the latter removed the struct updated by the former, so
> I just did that) and can carry the fix as necessary.

Thanks Stephen, resolution looks good. I'll probably wind up pulling the
arm64 branch into the kvmarm tree.

--
Thanks,
Oliver

\
 
 \ /
  Last update: 2023-10-24 08:50    [W:0.152 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site