[arch-commits] Commit in linux-lts/trunk (config)

[Andreas Radke]

    Date: Monday, March 15, 2021 @ 06:22:01
  Author: andyrtr
Revision: 409989

FS#69479: Disable BCM63XX drivers; FS#33958, FS#35753: Fix tomoyo settings

Modified:
  linux-lts/trunk/config

--------+
 config |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: config
===================================================================
--- config	2021-03-14 23:49:39 UTC (rev 409988)
+++ config	2021-03-15 06:22:01 UTC (rev 409989)
@@ -6542,7 +6542,7 @@
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_ATMEL_SOC=m
-CONFIG_SND_BCM63XX_I2S_WHISTLER=m
+# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_DESIGNWARE_PCM=y
 
@@ -9504,8 +9504,8 @@
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 # CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_HASH=y