Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62b1b67 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable SELinux and its dependencies"

parents ef4be356 771404e9

arch/arm64/configs/msm-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-perf" 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -81,6 +82,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y 
CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -98,11 +100,13 @@ CONFIG_NF_CT_NETLINK=y 
CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y
@@ -144,6 +148,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y

CONFIG_IP_NF_ARPTABLES=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y
@@ -458,6 +463,7 @@ CONFIG_EXT2_FS_XATTR=y 
CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y
@@ -474,6 +480,10 @@ CONFIG_TIMER_STATS=y 
CONFIG_DEBUG_INFO=y

CONFIG_IPC_LOGGING=y

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

arch/arm64/configs/msm_defconfig

+8 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -83,6 +84,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y 
CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y
@@ -101,11 +103,13 @@ CONFIG_NETFILTER_TPROXY=y 
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y
@@ -147,6 +151,7 @@ CONFIG_IP_NF_TARGET_NETMAP=y 
CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y

CONFIG_IP_NF_ARPTABLES=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y
@@ -534,6 +539,9 @@ CONFIG_FREE_PAGES_RDONLY=y 
CONFIG_KERNEL_TEXT_RDONLY=y

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y