The patch titled memcg-fix-used-bit-handling-at-uncharge-in-thp-fix has been removed from the -mm tree. Its filename was memcg-fix-used-bit-handling-at-uncharge-in-thp-fix.patch This patch was dropped because it was folded into memcg-fix-used-bit-handling-at-uncharge-in-thp.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-fix-used-bit-handling-at-uncharge-in-thp-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> include/linux/memcontrol.h:343: warning: return type defaults to 'int' Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/memcontrol.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/memcontrol.h~memcg-fix-used-bit-handling-at-uncharge-in-thp-fix include/linux/memcontrol.h --- a/include/linux/memcontrol.h~memcg-fix-used-bit-handling-at-uncharge-in-thp-fix +++ a/include/linux/memcontrol.h @@ -339,7 +339,8 @@ u64 mem_cgroup_get_limit(struct mem_cgro return 0; } -static inline mem_cgroup_split_huge_fixup(struct page *head, struct page *tail) +static inline void mem_cgroup_split_huge_fixup(struct page *head, + struct page *tail) { } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-compaction-prevent-division-by-zero-during-user-requested-compaction.patch fs-direct-ioc-dont-try-to-allocate-more-than-bio_max_pages-in-a-bio.patch memcg-fix-used-bit-handling-at-uncharge-in-thp.patch linux-next.patch next-remove-localversion.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch change-acquire-release_console_sem-to-console_lock-unlock-checkpatch-fixes.patch arch-alpha-include-asm-ioh-s-extern-inline-static-inline.patch mm-vmap-area-cache.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch drivers-message-fusion-mptsasc-fix-warning.patch mm.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch sigma-firmware-loader-for-analog-devices-sigmastudio-fix.patch epoll-fix-compiler-warning-and-optimize-the-non-blocking-path.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch exec_domain-establish-a-linux32-domain-on-config_compat-systems.patch scatterlist-new-helper-functions.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-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