--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -56,1 +56,1 @@ 
-CONFIG_LOCALVERSION="-160929"
---
+CONFIG_LOCALVERSION="-161022"
@@ -91,0 +91,1 @@ 
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
@@ -146,1 +147,15 @@ 
-# CONFIG_CGROUPS is not set
---
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+# CONFIG_BLK_CGROUP is not set
+# CONFIG_CGROUP_SCHED is not set
+# CONFIG_CGROUP_PIDS is not set
+# CONFIG_CGROUP_FREEZER is not set
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CPUSETS is not set
+# CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CGROUP_CPUACCT is not set
+# CONFIG_CGROUP_PERF is not set
+# CONFIG_CGROUP_DEBUG is not set
@@ -282,0 +297,1 @@ 
+# CONFIG_GCOV_KERNEL is not set
@@ -368,0 +384,1 @@ 
+# CONFIG_IOSF_MBI_DEBUG is not set
@@ -571,0 +588,1 @@ 
+# CONFIG_ACPI_CUSTOM_METHOD is not set
@@ -710,0 +728,1 @@ 
+CONFIG_NET_EGRESS=y
@@ -844,1 +863,2 @@ 
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
---
+CONFIG_NF_CT_NETLINK_HELPER=y
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
@@ -884,2 +904,2 @@ 
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-# CONFIG_NETFILTER_XT_SET is not set
---
+CONFIG_NETFILTER_XT_CONNMARK=y
+CONFIG_NETFILTER_XT_SET=y
@@ -890,1 +910,1 @@ 
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
---
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
@@ -921,0 +941,1 @@ 
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
@@ -950,1 +971,1 @@ 
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
---
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
@@ -1083,1 +1104,1 @@ 
-# CONFIG_BRIDGE_EBT_MARK_T is not set
---
+CONFIG_BRIDGE_EBT_MARK_T=y
@@ -1109,1 +1130,65 @@ 
-# CONFIG_NET_SCHED is not set
---
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+# CONFIG_NET_SCH_CBQ is not set
+CONFIG_NET_SCH_HTB=y
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+CONFIG_NET_SCH_SFQ=y
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_FQ is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_PIE is not set
+CONFIG_NET_SCH_INGRESS=y
+# CONFIG_NET_SCH_PLUG is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_ROUTE4 is not set
+CONFIG_NET_CLS_FW=y
+CONFIG_NET_CLS_U32=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+# 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_BPF is not set
+# CONFIG_NET_CLS_FLOWER is not set
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=y
+# CONFIG_GACT_PROB is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_ACT_VLAN=y
+# CONFIG_NET_ACT_BPF is not set
+# CONFIG_NET_ACT_CONNMARK is not set
+# CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
@@ -1124,0 +1209,2 @@ 
+# CONFIG_CGROUP_NET_PRIO is not set
+# CONFIG_CGROUP_NET_CLASSID is not set
@@ -1477,0 +1564,1 @@ 
+# CONFIG_IFB is not set
@@ -1478,1 +1566,2 @@ 
-# CONFIG_MACVLAN is not set
---
+CONFIG_MACVLAN=y
+CONFIG_MACVTAP=y
@@ -1540,0 +1629,1 @@ 
+# CONFIG_SKY2_DEBUG is not set
@@ -3510,0 +3600,1 @@ 
+# CONFIG_MCE_AMD_INJ is not set
@@ -3700,0 +3791,1 @@ 
+# CONFIG_NFSD_FAULT_INJECTION is not set
@@ -3787,0 +3879,1 @@ 
+# CONFIG_DYNAMIC_DEBUG is not set
@@ -3799,1 +3892,1 @@ 
-# CONFIG_DEBUG_FS is not set
---
+CONFIG_DEBUG_FS=y
@@ -3920,0 +4013,1 @@ 
+# CONFIG_LKDTM is not set
@@ -3974,0 +4068,1 @@ 
+# CONFIG_DEBUG_BOOT_PARAMS is not set