The patch titled mm-make-swap-token-dummies-static-inlines-fix has been removed from the -mm tree. Its filename was mm-make-swap-token-dummies-static-inlines-fix.patch This patch was dropped because it was folded into mm-make-swap-token-dummies-static-inlines.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm-make-swap-token-dummies-static-inlines-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/swap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/swap.h~mm-make-swap-token-dummies-static-inlines-fix include/linux/swap.h --- a/include/linux/swap.h~mm-make-swap-token-dummies-static-inlines-fix +++ a/include/linux/swap.h @@ -445,7 +445,7 @@ static inline void put_swap_token(struct { } -static inline void grab_swap_token(void) +static inline void grab_swap_token(struct mm_struct *mm) { } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fs-make-sure-data-stored-into-inode-is-properly-seen-before-unlocking-new-inode-fix.patch drivers-mfd-ab3100-corec-fiw-warning-and-powerpc-build-error.patch mm-make-swap-token-dummies-static-inlines.patch mm-make-swap-token-dummies-static-inlines-fix.patch readahead-add-blk_run_backing_dev-fix.patch readahead-add-blk_run_backing_dev-fix-fix-2.patch memory-hotplug-update-zone-pcp-at-memory-online-fix.patch revert-hugetlb-restore-interleaving-of-bootmem-huge-pages-2631.patch vmscan-dont-attempt-to-reclaim-anon-page-in-lumpy-reclaim-when-no-swap-space-is-avilable.patch revert-proc-kcore-work-around-a-bug.patch arches-drop-superfluous-casts-in-nr_free_pages-callers-checkpatch-fixes.patch tracing-page-allocator-add-trace-event-for-page-traffic-related-to-the-buddy-lists-fix.patch page-allocator-maintain-rolling-count-of-pages-to-free-from-the-pcp-checkpatch-fixes.patch mm-zero_page-without-pte_special-mips-fix.patch dev-mem-cleanup-unxlate_dev_mem_ptr-calls-fix.patch dev-mem-cleanup-unxlate_dev_mem_ptr-calls-fix-fix.patch hugetlb-add-map_hugetlb-for-mmaping-pseudo-anonymous-huge-page-regions-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch alpha-convert-to-use-arch_gettimeoffset-fix.patch cpuidle-fix-the-menu-governor-to-boost-io-performance.patch printk-boot_delay-rename-printk_delay_msec-to-loops_per_msec-fix.patch printk-add-printk_delay-to-make-messages-readable-for-some-scenarios-fix.patch printk-add-printk_delay-to-make-messages-readable-for-some-scenarios-cleanup.patch generic-ipi-make-struct-call_function_data-lockless-cleanup.patch proc-connector-add-event-for-process-becoming-session-leader.patch build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix.patch kernel-smpc-relocate-some-code.patch mmc-register-mmci-omap-hs-using-platform_driver_probe.patch sdio-add-cd-disable-support-cleanup.patch sdio-add-mmc_quirk_lenient_fn0-fix.patch at91-atmel-mci-platform-configuration-to-the-the-atmel-mci-driver-checkpatch-fixes.patch mmc-core-sdio-suspend-resume-support-fix.patch procfs-provide-stack-information-for-threads-v011-fix.patch walk-system-ram-range-fix-2.patch kcore-register-vmemmap-range-fix.patch rtc-add-driver-for-mxcs-internal-rtc-module-fix.patch rtc-add-driver-for-mxcs-internal-rtc-module-fix-fix.patch gpiolib-add-names-file-in-gpio-chip-sysfs-checkpatch-fixes.patch gpiolib-add-names-file-in-gpio-chip-sysfs-checkpatch-fixes-fix.patch davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx.patch davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4-cleanup.patch drivers-video-add-kmalloc-null-tests-fix.patch drivers-video-tmiofbc-fix-uninitialised-return-value.patch v3-minixfs-add-missing-directory-type-checking-checkpatch-fixes.patch page-types-add-feature-for-walking-process-address-space-checkpatch-fixes.patch memcg-remove-the-overhead-associated-with-the-root-cgroup-fix.patch memcg-add-comments-explaining-memory-barriers-checkpatch-fixes.patch memory-controller-soft-limit-reclaim-on-contention-v9-fix.patch memcg-improve-resource-counter-scalability-checkpatch-fixes.patch exec-make-do_coredump-more-resilient-to-recursive-crashes-v9-checkpatch-fixes.patch exec-let-do_coredump-limit-the-number-of-concurrent-dumps-to-pipes-v9-checkpatch-fixes.patch elf-clean-up-fill_note_info-fix.patch net-netfilter-ipvs-ip_vs_wrrc-use-lib-gcdc-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch fs-reiser4-contextc-current_is_pdflush-got-removed.patch reiser4-fix.patch reiser4-disable.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.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