From 632c6720f46445d937c6a8a09a333c4e3793dda2 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Fri, 31 Mar 2023 12:52:02 -0700 Subject: [PATCH] ANDROID: defconfig: Remove "-mainline" from LOCALVERSION for gki and consolidate Remove "-mainline" from LOCALVERSION from both gki_defconfig and consolidate fragments in order to allow VINTF tests to run on android14-6.1 now that the requisite config [1] has made it downstream. Also remove LOCALVERSION override in gki_defconfig, following what has been done for android13-5.15. [1] https://android-review.googlesource.com/c/kernel/configs/+/2450908 Bug: 272123548 Change-Id: I11a72e56ad9a665f5ba87755b3e6f168aa682f3e Signed-off-by: Guru Das Srinagesh --- arch/arm64/configs/consolidate.fragment | 2 +- arch/arm64/configs/gki_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/configs/consolidate.fragment b/arch/arm64/configs/consolidate.fragment index a03381dfe133..9fabdec41f61 100644 --- a/arch/arm64/configs/consolidate.fragment +++ b/arch/arm64/configs/consolidate.fragment @@ -31,7 +31,7 @@ CONFIG_GKI_HACKS_FOR_DEBUG_CONFIG=y # CONFIG_LINEAR_RANGES_TEST is not set # CONFIG_LIST_KUNIT_TEST is not set # CONFIG_LKDTM is not set -CONFIG_LOCALVERSION="-mainline-qki-consolidate" +CONFIG_LOCALVERSION="-qki-consolidate" CONFIG_LOCKUP_DETECTOR=y # CONFIG_PERCPU_TEST is not set CONFIG_PID_IN_CONTEXTIDR=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index ebe6690d87aa..d8c99ca32e6d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -1,5 +1,4 @@ CONFIG_UAPI_HEADER_TEST=y -CONFIG_LOCALVERSION="-mainline-qki" CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y