shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: Remove CONFIG_LOCALVERSION="-mainline" on 6.1 branch

Browse Source 
Appending -mainline should not be done on the v6.1 branch.

Since the BRANCH constant was correctly set in
e486eabf3a 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 <gpeter@google.com>
This commit is contained in:
Peter Griffin
2023-01-06 23:36:38 +00:00
committed by Treehugger Robot
parent 435e2a6a6c
commit 09ad10d4ee
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/configs/gki_defconfig
View File

@@ -1,5 +1,4 @@
CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-mainline"
CONFIG_AUDIT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y

1
arch/x86/configs/gki_defconfig
View File

@@ -1,5 +1,4 @@
CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-mainline"
CONFIG_KERNEL_LZ4=y
CONFIG_AUDIT=y
CONFIG_NO_HZ=y