The patch titled mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix has been removed from the -mm tree. Its filename was mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix.patch This patch was dropped because it was folded into mm-allow-gup-to-fail-instead-of-waiting-on-a-page.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Avi Kivity <avi@xxxxxxxxxx> Cc: Gleb Natapov <gleb@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx> Cc: Michel Lespinasse <walken@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/mm.h~mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix include/linux/mm.h --- a/include/linux/mm.h~mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix +++ a/include/linux/mm.h @@ -1539,7 +1539,8 @@ struct page *follow_page(struct vm_area_ #define FOLL_GET 0x04 /* do get_page on page */ #define FOLL_DUMP 0x08 /* give error on hole if it would be zero */ #define FOLL_FORCE 0x10 /* get_user_pages read/write w/o permission */ -#define FOLL_NOWAIT 0x20 /* return if disk transfer is needed */ +#define FOLL_NOWAIT 0x20 /* if a disk transfer is needed, start the IO + * and return without waiting upon it */ #define FOLL_MLOCK 0x40 /* mark page as mlocked */ #define FOLL_SPLIT 0x80 /* don't return transhuge pages, split them */ #define FOLL_HWPOISON 0x100 /* check page is hwpoisoned */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch include-asm-generic-unistdh-fix-syncfs-syscall-number.patch leds-convert-bd2802-driver-to-dev_pm_ops.patch mm-vmap-area-cache.patch mm-allow-gup-to-fail-instead-of-waiting-on-a-page.patch mm-batch-free-pcp-list-if-possible-fix.patch memcg-move-memcg-reclaimable-page-into-tail-of-inactive-list-fix.patch pagewalk-only-split-huge-pages-when-necessary-checkpatch-fixes.patch mm-compaction-minimise-the-time-irqs-are-disabled-while-isolating-pages-for-migration-fix.patch mm-add-__gfp_other_node-flag-checkpatch-fixes.patch mm-use-__gfp_other_node-for-transparent-huge-pages-checkpatch-fixes.patch drivers-misc-hmc6352c-fix-wrong-return-value-checking-for-i2c_master_recv-fix.patch kernel-cpuc-fix-many-errors-related-to-style-fix.patch calibrate-retry-with-wider-bounds-when-converge-seems-to-fail-fix.patch kernel-watchdogc-allow-hardlockup-to-panic-by-default-fix.patch epoll-fix-compiler-warning-and-optimize-the-non-blocking-path.patch fs-coda-fix-compile-warning-when-config_sysctl=n-fix.patch documentation-vm-page-typesc-auto-debugfs-mount-for-hwpoison-operation-fix.patch documentation-vm-page-typesc-auto-debugfs-mount-for-hwpoison-operation-fix-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