From 8390e533e578c99a7141c7465eba30ac79d4ebb5 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Tue, 15 Dec 2020 11:56:26 -0800 Subject: [PATCH] ANDROID: GKI: Drop CONFIG_LOCALVERSION on 5.10 Not needed on release branches. Bug: 175707513 Change-Id: I9e60d8c6b9ce99251757957e080f01e671fb0890 Signed-off-by: Alistair Delva --- 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 104d793be9a3..240f80b19c91 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -1,4 +1,3 @@ -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 e1c1d7c49cc5..2c853325b0a1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -1,4 +1,3 @@ -CONFIG_LOCALVERSION="-mainline" CONFIG_KERNEL_LZ4=y # CONFIG_USELIB is not set CONFIG_AUDIT=y