From 9b0d1af931aeb96c487b83e929bb026c9af73bdc Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Tue, 18 Feb 2020 22:55:21 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Enable CONFIG_NET_NS Bug: 144061615 Bug: 147493341 Change-Id: I6392a7ee9c8ab26ca3e033889d8311661e6ec4aa Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 3 +++ arch/x86/configs/gki_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d105ed1c16d0..10cdad18d8eb 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -19,6 +19,9 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_BPF=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_PID_NS is not set CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b18274a0f95a..33baed68c997 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -19,6 +19,9 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_BPF=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_PID_NS is not set CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set