From 09ad10d4ee63f8983acad5515463dd202cc83054 Mon Sep 17 00:00:00 2001 From: Peter Griffin Date: Fri, 6 Jan 2023 23:36:38 +0000 Subject: [PATCH] ANDROID: GKI: Remove CONFIG_LOCALVERSION="-mainline" on 6.1 branch Appending -mainline should not be done on the v6.1 branch. Since the BRANCH constant was correctly set in e486eabf3a8c5c95b44aa2f540f3cc25c4d34f8b having CONFIG_LOCALVERSION also set causes the bazel //common:kernel_aarch64_test test_vmlinux_contains_scmversion test to fail. Bug: 264649337 Bug: 259701619 Change-Id: I9b7235bcbfdb2fafb4699dcc0e7bf809c68b608a Signed-off-by: Peter Griffin --- 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 364672cccecc..69d2ec28f629 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" CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index d3c59b668ae0..109d0ec44fce 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -1,5 +1,4 @@ CONFIG_UAPI_HEADER_TEST=y -CONFIG_LOCALVERSION="-mainline" CONFIG_KERNEL_LZ4=y CONFIG_AUDIT=y CONFIG_NO_HZ=y