commit a97985d801ad8c0dba8882c798236d54d57f24f3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 19 00:01:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 00:01:33 2024 +0000
tree 20cc3b88dae3c34b231723d2e336acc8b6974d70
parent 7ff2d092910b1741a45eaed8b03e8d560aad70fa
parent c4f8f0f47dbf3ed1905479a54bc335e67243509c

Merge "V: Drop USB gadget config for uevent and accessory from base" into main

v/android-6.6/android-base.config

diff --git a/v/android-6.6/android-base.config b/v/android-6.6/android-base.config
index cd78362..b5edf77 100644
--- a/v/android-6.6/android-base.config
+++ b/v/android-6.6/android-base.config
@@ -28,6 +28,7 @@
 CONFIG_BLOCK=y
 CONFIG_BPF_JIT=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_CC_IS_CLANG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_BPF=y
@@ -52,7 +53,6 @@
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_DM_DEFAULT_KEY=y
 CONFIG_DM_SNAPSHOT=y