During v4.17 merge window, patch 830dcc9f9a7c "arm64: capabilities: Change scope of VHE to Boot CPU feature" has been merged into mainline kernel in a patchset with other 37 patches 65896545b69f