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

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

Merge "defconfig: msmcortex_mediabox : Enable docker"

parents b85aa29d 2442b803

arch/arm64/configs/msmcortex_mediabox-perf_defconfig

+11 −2
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-perf"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y
@@ -11,16 +12,16 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

CONFIG_SCHED_HMP_CSTATE_AWARE=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y

CONFIG_BLK_DEV_INITRD=y
@@ -110,6 +111,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -140,6 +142,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y 
CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -149,6 +152,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=y 
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y

CONFIG_NETFILTER_XT_MATCH_HELPER=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

CONFIG_NETFILTER_XT_MATCH_IPVS=y

# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LENGTH=y

CONFIG_NETFILTER_XT_MATCH_LIMIT=y
@@ -166,6 +170,7 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=y 
CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_IP_VS=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y
@@ -270,6 +275,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_SKY2=y

CONFIG_RNDIS_IPA=y

CONFIG_SMSC911X=y
@@ -304,6 +310,7 @@ CONFIG_INPUT_QPNP_POWER_ON=y 
CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set
@@ -589,7 +596,9 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_BTRFS_FS=y

CONFIG_FUSE_FS=y

CONFIG_OVERLAY_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS_POSIX_ACL=y

arch/arm64/configs/msmcortex_mediabox_defconfig

+11 −2
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y
@@ -13,16 +14,16 @@ CONFIG_IKCONFIG_PROC=y 
CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

CONFIG_SCHED_HMP_CSTATE_AWARE=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_SCHED_TUNE=y

CONFIG_BLK_DEV_INITRD=y
@@ -108,6 +109,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -138,6 +140,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y 
CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -147,6 +150,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=y 
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y

CONFIG_NETFILTER_XT_MATCH_HELPER=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

CONFIG_NETFILTER_XT_MATCH_IPVS=y

# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LENGTH=y

CONFIG_NETFILTER_XT_MATCH_LIMIT=y
@@ -164,6 +168,7 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=y 
CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_IP_VS=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y
@@ -273,6 +278,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -306,6 +312,7 @@ CONFIG_INPUT_KEYCHORD=y 
CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y
@@ -604,7 +611,9 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_BTRFS_FS=y

CONFIG_FUSE_FS=y

CONFIG_OVERLAY_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS_POSIX_ACL=y