The patch titled Subject: kernel-res_counter-remove-the-unused-api-fix has been removed from the -mm tree. Its filename was kernel-res_counter-remove-the-unused-api-fix.patch This patch was dropped because it was folded into kernel-res_counter-remove-the-unused-api.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: kernel-res_counter-remove-the-unused-api-fix update Documentation/cgroups/memory.txt Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Reported-by: Paul Bolle <pebolle@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/cgroups/memory.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN Documentation/cgroups/memory.txt~kernel-res_counter-remove-the-unused-api-fix Documentation/cgroups/memory.txt --- a/Documentation/cgroups/memory.txt~kernel-res_counter-remove-the-unused-api-fix +++ a/Documentation/cgroups/memory.txt @@ -352,9 +352,8 @@ set: 0. Configuration a. Enable CONFIG_CGROUPS -b. Enable CONFIG_RESOURCE_COUNTERS -c. Enable CONFIG_MEMCG -d. Enable CONFIG_MEMCG_SWAP (to use swap extension) +b. Enable CONFIG_MEMCG +c. Enable CONFIG_MEMCG_SWAP (to use swap extension) d. Enable CONFIG_MEMCG_KMEM (to use kmem extension) 1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory.patch slab-improve-checking-for-invalid-gfp_flags.patch mm-memcontrol-lockless-page-counters.patch kernel-res_counter-remove-the-unused-api.patch mm-compaction-simplify-deferred-compaction-fix.patch mm-compaction-always-update-cached-scanner-positions-fix-checkpatch-fixes.patch mm-memcontrol-remove-unnecessary-pcg_used-pc-mem_cgroup-valid-flag-fix.patch mm-memcontrol-fold-mem_cgroup_start_move-mem_cgroup_end_move-fix.patch mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2-fix.patch fs-proc-use-a-rb-tree-for-the-directory-entries-fix.patch fs-binfmt_miscc-use-gfp_kernel-instead-of-gfp_user.patch init-allow-config_init_fallback=n-to-disable-defaults-if-init=-fails-checkpatch-fixes.patch rtc-omap-add-support-for-pmic_power_en-v3-fix.patch drivers-rtc-rtc-sirfsocc-add-alarm_irq_enable-support-fix.patch rtc-ds1374-add-watchdog-support-fix.patch rtc-ds1374-add-watchdog-support-checkpatch-fixes.patch exit-wait-cleanup-the-ptrace_reparented-checks-fix.patch -- 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