From 90f9bd8552edecb27cd215fe6488a51400694a64 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 28 Jul 2025 22:09:46 +0000 Subject: [PATCH] ANDROID: Remove CONFIG_INET_DIAG from microdroid kernels This feature is not needed in microdroid, so remove it. Bug: 434256355 Signed-off-by: Isaac J. Manjarres (cherry picked from https://android-review.googlesource.com/q/commit:9ee492fee3ab8ebb364254bfad4e67e08873b597) Merged-In: I5ec0baaf722461532b76f629cb639051c8bd1a0d Change-Id: I5ec0baaf722461532b76f629cb639051c8bd1a0d --- arch/arm64/configs/microdroid_defconfig | 1 + arch/x86/configs/microdroid_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig index 3c7760d370c1..12719503284a 100644 --- a/arch/arm64/configs/microdroid_defconfig +++ b/arch/arm64/configs/microdroid_defconfig @@ -65,6 +65,7 @@ CONFIG_LRU_GEN=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y +# CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_VSOCKETS=y CONFIG_VIRTIO_VSOCKETS=y diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index df694017ac13..87765c07d7c5 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -68,6 +68,7 @@ CONFIG_DAMON_RECLAIM=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y +# CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_VSOCKETS=y CONFIG_VIRTIO_VSOCKETS=y