From e6c45b356ae8cf3ab10a372352e34ad3d39d998b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Mar 2023 16:23:40 +0000 Subject: [PATCH] ANDROID: GKI: remove CONFIG_BFQ_GROUP_IOSCHED from gki_defconfig In commit 4a6a7bc21d47 ("block: Default to use cgroup support for BFQ"), CONFIG_BFQ_GROUP_IOSCHED became "default y", so the build breaks when comparing the defconfig of the gki_defconfig files. Remove that option as it's no longer needed to be specified directly. Fixes: 4a6a7bc21d47 ("block: Default to use cgroup support for BFQ") Signed-off-by: Greg Kroah-Hartman Change-Id: I15eb6a68bb95e103dca850862c00095afabafc14 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 6180d7f547a5..259da1b6642b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -89,7 +89,6 @@ CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_IOSCHED_BFQ=y -CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 9e5d10aa6307..ed7e07eebc47 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -89,7 +89,6 @@ CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_IOSCHED_BFQ=y -CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=y