The patch titled mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix 2 has been removed from the -mm tree. Its filename was mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix-2.patch This patch was dropped because it was folded into mm-fix-fault-vs-invalidate-race-for-linear-mappings.patch ------------------------------------------------------ Subject: mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix 2 From: Nick Piggin <nickpiggin@xxxxxxxxxxxx> Fix typo in do_no_page vs invalidate race fix patch. Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/truncate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/truncate.c~mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix-2 mm/truncate.c --- a/mm/truncate.c~mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix-2 +++ a/mm/truncate.c @@ -235,7 +235,7 @@ void truncate_inode_pages_range(struct a wait_on_page_writeback(page); if (page_mapped(page)) { unmap_mapping_range(mapping, - (loff_t)page_index<<PAGE_CACHE_SHIFT, + (loff_t)page->index<<PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE, 0); } if (page->index > next) _ Patches currently in -mm which might be from nickpiggin@xxxxxxxxxxxx are ia64-race-flushing-icache-in-do_no_page-path.patch mm-fix-fault-vs-invalidate-race-for-linear-mappings.patch mm-fix-fault-vs-invalidate-race-for-linear-mappings-fix-2.patch mm-merge-nopfn-into-fault-fix.patch convert-hugetlbfs-to-use-vm_ops-fault.patch readahead-improve-heuristic-detecting-sequential-reads.patch readahead-code-cleanup.patch readahead-code-cleanup-fix.patch only-allow-nonlinear-vmas-for-ram-backed-filesystems.patch lazy-freeing-of-memory-through-madv_free.patch lazy-freeing-of-memory-through-madv_free-fix.patch madv_free-lazytlb-fix.patch lazy-freeing-of-memory-through-madv_free-vs-mm-madvise-avoid-exclusive-mmap_sem.patch restore-madv_dontneed-to-its-original-linux-behaviour.patch cpuset-remove-sched-domain-hooks-from-cpusets.patch freezer-task-exit_state-should-be-treated-as-bolean.patch as-fix-antic_expire-check.patch kblockd-use-flush_work.patch sched-fix-idle-load-balancing-in-softirqd-context.patch sched-dynticks-idle-load-balancing-v3.patch sched-optimize-siblings-status-check-logic-in-wake_idle.patch sched-align-rq-to-cacheline-boundary.patch sched-dont-renice-kernel-threads.patch sched-remove-sleepavg-from-proc.patch sched-implement-staircase-deadline-cpu-scheduler.patch sched-implement-staircase-deadline-cpu-scheduler-misc-fixes.patch sched-remove-noninteractive-flag.patch sched-document-sd-cpu-scheduler.patch sched-consolidate-sched_clock-drift-adjustments.patch sched-consolidate-sched_clock-drift-adjustments-fix.patch sched2-sched-domain-sysctl.patch revoke-core-code-break-cow-fixes.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