diff --git a/arch/arm/configs/n9_mer_defconfig b/arch/arm/configs/n9_mer_defconfig index dedc4b372768..acf2797d59fd 100644 --- a/arch/arm/configs/n9_mer_defconfig +++ b/arch/arm/configs/n9_mer_defconfig @@ -94,13 +94,13 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y -# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set -# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set # CONFIG_RT_GROUP_SCHED is not set -# CONFIG_BLK_CGROUP is not set +CONFIG_BLK_CGROUP=y # CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set @@ -647,7 +647,9 @@ CONFIG_NETFILTER_ADVANCED=y # CONFIG_NETFILTER_NETLINK_ACCT is not set # CONFIG_NETFILTER_NETLINK_QUEUE is not set # CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NETFILTER_XTABLES=m # @@ -710,7 +712,9 @@ CONFIG_NETFILTER_XTABLES=m # # CONFIG_NF_DEFRAG_IPV4 is not set # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=y +CONFIG_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y # CONFIG_IP_NF_ARPTABLES is not set # @@ -737,7 +741,7 @@ CONFIG_IP6_NF_IPTABLES=m # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=y # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set @@ -786,7 +790,7 @@ CONFIG_NET_SCHED=y # CONFIG_NET_CLS_RSVP is not set # CONFIG_NET_CLS_RSVP6 is not set # CONFIG_NET_CLS_FLOW is not set -# CONFIG_NET_CLS_CGROUP is not set +CONFIG_NET_CLS_CGROUP=y # CONFIG_NET_EMATCH is not set # CONFIG_NET_CLS_ACT is not set CONFIG_NET_SCH_FIFO=y @@ -794,7 +798,7 @@ CONFIG_NET_SCH_FIFO=y CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set -# CONFIG_NETPRIO_CGROUP is not set +CONFIG_NETPRIO_CGROUP=y CONFIG_BQL=y # CONFIG_BPF_JIT is not set