commit ce16057128ad1ec4b2a77c2272b8b6fdd647856c
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 04 13:50:01 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 04 13:50:00 2020 -0800
tree 5f6a68986f7c8d7173c0d8afdc24e7660331d7c1
parent b2398f1208506919fe275210ac24972d290c10aa
parent e425ca3e6de0396d0ca20d4c30a411de8043510f

Merge "defconfig: arm: delete DAC config on msm8909 device"

arch/arm/configs/msm8909-perf_defconfig

diff --git a/arch/arm/configs/msm8909-perf_defconfig b/arch/arm/configs/msm8909-perf_defconfig
index 9eecf62..23149f0 100755
--- a/arch/arm/configs/msm8909-perf_defconfig
+++ b/arch/arm/configs/msm8909-perf_defconfig
@@ -485,7 +485,6 @@
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_MD4=y

arch/arm/configs/msm8909_defconfig

diff --git a/arch/arm/configs/msm8909_defconfig b/arch/arm/configs/msm8909_defconfig
index 90ed132..9ce2354 100644
--- a/arch/arm/configs/msm8909_defconfig
+++ b/arch/arm/configs/msm8909_defconfig
@@ -593,7 +593,6 @@
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_MD4=y