The patch titled
Subject: arch/defconfig: remove CONFIG_RESOURCE_COUNTERS
has been removed from the -mm tree. Its filename was
arch-defconfig-remove-config_resource_counters.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Subject: arch/defconfig: remove CONFIG_RESOURCE_COUNTERS
This option was replaced by PAGE_COUNTER which is selected by MEMCG.
Signed-off-by: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Balbir Singh <bsingharora@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/configs/bcm_defconfig | 1 -
arch/arm/configs/zx_defconfig | 1 -
arch/mips/configs/db1xxx_defconfig | 1 -
arch/mips/configs/loongson3_defconfig | 1 -
arch/mn10300/configs/asb2364_defconfig | 1 -
arch/sh/configs/apsh4ad0a_defconfig | 1 -
arch/sh/configs/sdk7786_defconfig | 1 -
arch/sh/configs/se7206_defconfig | 1 -
arch/sh/configs/shx3_defconfig | 1 -
arch/sh/configs/urquell_defconfig | 1 -
arch/tile/configs/tilegx_defconfig | 1 -
arch/tile/configs/tilepro_defconfig | 1 -
arch/um/configs/i386_defconfig | 1 -
arch/um/configs/x86_64_defconfig | 1 -
arch/x86/configs/i386_defconfig | 1 -
arch/x86/configs/x86_64_defconfig | 1 -
arch/xtensa/configs/generic_kc705_defconfig | 1 -
arch/xtensa/configs/smp_lx200_defconfig | 1 -
18 files changed, 18 deletions(-)
diff -puN arch/arm/configs/bcm_defconfig~arch-defconfig-remove-config_resource_counters arch/arm/configs/bcm_defconfig
--- a/arch/arm/configs/bcm_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/arm/configs/bcm_defconfig
@@ -12,7 +12,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
diff -puN arch/arm/configs/zx_defconfig~arch-defconfig-remove-config_resource_counters arch/arm/configs/zx_defconfig
--- a/arch/arm/configs/zx_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/arm/configs/zx_defconfig
@@ -7,7 +7,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_NAMESPACES=y
diff -puN arch/mips/configs/db1xxx_defconfig~arch-defconfig-remove-config_resource_counters arch/mips/configs/db1xxx_defconfig
--- a/arch/mips/configs/db1xxx_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/mips/configs/db1xxx_defconfig
@@ -18,7 +18,6 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_KMEM=y
diff -puN arch/mips/configs/loongson3_defconfig~arch-defconfig-remove-config_resource_counters arch/mips/configs/loongson3_defconfig
--- a/arch/mips/configs/loongson3_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/mips/configs/loongson3_defconfig
@@ -25,7 +25,6 @@ CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CPUSETS=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
diff -puN arch/mn10300/configs/asb2364_defconfig~arch-defconfig-remove-config_resource_counters arch/mn10300/configs/asb2364_defconfig
--- a/arch/mn10300/configs/asb2364_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/mn10300/configs/asb2364_defconfig
@@ -11,7 +11,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_RELAY=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_EXPERT=y
diff -puN arch/sh/configs/apsh4ad0a_defconfig~arch-defconfig-remove-config_resource_counters arch/sh/configs/apsh4ad0a_defconfig
--- a/arch/sh/configs/apsh4ad0a_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/sh/configs/apsh4ad0a_defconfig
@@ -10,7 +10,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEMCG=y
CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
diff -puN arch/sh/configs/sdk7786_defconfig~arch-defconfig-remove-config_resource_counters arch/sh/configs/sdk7786_defconfig
--- a/arch/sh/configs/sdk7786_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/sh/configs/sdk7786_defconfig
@@ -17,7 +17,6 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y
diff -puN arch/sh/configs/se7206_defconfig~arch-defconfig-remove-config_resource_counters arch/sh/configs/se7206_defconfig
--- a/arch/sh/configs/se7206_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/sh/configs/se7206_defconfig
@@ -10,7 +10,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEMCG=y
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
diff -puN arch/sh/configs/shx3_defconfig~arch-defconfig-remove-config_resource_counters arch/sh/configs/shx3_defconfig
--- a/arch/sh/configs/shx3_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/sh/configs/shx3_defconfig
@@ -12,7 +12,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEMCG=y
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
diff -puN arch/sh/configs/urquell_defconfig~arch-defconfig-remove-config_resource_counters arch/sh/configs/urquell_defconfig
--- a/arch/sh/configs/urquell_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/sh/configs/urquell_defconfig
@@ -14,7 +14,6 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y
diff -puN arch/tile/configs/tilegx_defconfig~arch-defconfig-remove-config_resource_counters arch/tile/configs/tilegx_defconfig
--- a/arch/tile/configs/tilegx_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/tile/configs/tilegx_defconfig
@@ -16,7 +16,6 @@ CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
diff -puN arch/tile/configs/tilepro_defconfig~arch-defconfig-remove-config_resource_counters arch/tile/configs/tilepro_defconfig
--- a/arch/tile/configs/tilepro_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/tile/configs/tilepro_defconfig
@@ -15,7 +15,6 @@ CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
diff -puN arch/um/configs/i386_defconfig~arch-defconfig-remove-config_resource_counters arch/um/configs/i386_defconfig
--- a/arch/um/configs/i386_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/um/configs/i386_defconfig
@@ -17,7 +17,6 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_PID_NS is not set
diff -puN arch/um/configs/x86_64_defconfig~arch-defconfig-remove-config_resource_counters arch/um/configs/x86_64_defconfig
--- a/arch/um/configs/x86_64_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/um/configs/x86_64_defconfig
@@ -15,7 +15,6 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_PID_NS is not set
diff -puN arch/x86/configs/i386_defconfig~arch-defconfig-remove-config_resource_counters arch/x86/configs/i386_defconfig
--- a/arch/x86/configs/i386_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/x86/configs/i386_defconfig
@@ -17,7 +17,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_COMPAT_BRK is not set
diff -puN arch/x86/configs/x86_64_defconfig~arch-defconfig-remove-config_resource_counters arch/x86/configs/x86_64_defconfig
--- a/arch/x86/configs/x86_64_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/x86/configs/x86_64_defconfig
@@ -16,7 +16,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_COMPAT_BRK is not set
diff -puN arch/xtensa/configs/generic_kc705_defconfig~arch-defconfig-remove-config_resource_counters arch/xtensa/configs/generic_kc705_defconfig
--- a/arch/xtensa/configs/generic_kc705_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/xtensa/configs/generic_kc705_defconfig
@@ -11,7 +11,6 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_NAMESPACES=y
CONFIG_SCHED_AUTOGROUP=y
diff -puN arch/xtensa/configs/smp_lx200_defconfig~arch-defconfig-remove-config_resource_counters arch/xtensa/configs/smp_lx200_defconfig
--- a/arch/xtensa/configs/smp_lx200_defconfig~arch-defconfig-remove-config_resource_counters
+++ a/arch/xtensa/configs/smp_lx200_defconfig
@@ -11,7 +11,6 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_NAMESPACES=y
CONFIG_SCHED_AUTOGROUP=y
_
Patches currently in -mm which might be from koct9i@xxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
