[Devel] [PATCH RHEL10 COMMIT] ve: source Kconfig.openvz from arch/um/Kconfig

[Konstantin Khorenko]

The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.39.1.16.6.vz10
------>
commit 7af242cadc5afb5e16e5de46dec75062ea1fe949
Author: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
Date:   Fri Aug 21 18:36:51 2026 +0200

    ve: source Kconfig.openvz from arch/um/Kconfig
    
    kernel/Kconfig.openvz was only sourced from arch/x86/Kconfig, making
    CONFIG_VE unavailable on UML.  Source it from arch/um/Kconfig so that
    VZ containers can be enabled when building under User-Mode Linux
    (needed for KUnit testing).
    
    CONFIG_VE is "default y", so this alone gives CONFIG_VE=y for a plain
    "make ARCH=um defconfig".  That is what we want, but it also means every
    UML build from here on compiles the VZ code and trips over the x86-only
    parts of it; those are fixed up later in this series.
    
    The source line goes after the last endmenu of the file, like the x86 one,
    so that the OpenVZ menu does not end up nested inside another menu.
    
    Feature: fix KUnit tests
    https://virtuozzo.atlassian.net/browse/VSTOR-134732
    Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 arch/um/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index c89575d05021f..5e1b6d0257733 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -252,3 +252,5 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 endmenu
+
+source "kernel/Kconfig.openvz"