The patch titled Subject: mm: move most file-based accounting to the node -fix has been removed from the -mm tree. Its filename was mm-move-most-file-based-accounting-to-the-node-fix.patch This patch was dropped because it was folded into mm-move-most-file-based-accounting-to-the-node.patch ------------------------------------------------------ From: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Subject: mm: move most file-based accounting to the node -fix As noted by Johannes Weiner, NR_ZONE_WRITE_PENDING gets decremented twice during migration instead of a dec(old) -> inc(new) cycle as intended. This is a fix to mmotm patch mm-move-most-file-based-accounting-to-the-node.patch Note that it'll cause a conflict with mm-vmstat-remove-zone-and-node-double-accounting-by-approximating-retries.patch but that the resolution is trivial. Link: http://lkml.kernel.org/r/1468404004-5085-5-git-send-email-mgorman@xxxxxxxxxxxxxxxxxxx Signed-off-by: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/migrate.c~mm-move-most-file-based-accounting-to-the-node-fix mm/migrate.c --- a/mm/migrate.c~mm-move-most-file-based-accounting-to-the-node-fix +++ a/mm/migrate.c @@ -515,7 +515,7 @@ int migrate_page_move_mapping(struct add __dec_node_state(oldzone->zone_pgdat, NR_FILE_DIRTY); __dec_zone_state(oldzone, NR_ZONE_WRITE_PENDING); __inc_node_state(newzone->zone_pgdat, NR_FILE_DIRTY); - __dec_zone_state(newzone, NR_ZONE_WRITE_PENDING); + __inc_zone_state(newzone, NR_ZONE_WRITE_PENDING); } } local_irq_enable(); _ Patches currently in -mm which might be from mgorman@xxxxxxxxxxxxxxxxxxx are mm-meminit-remove-early_page_nid_uninitialised.patch mm-vmstat-add-infrastructure-for-per-node-vmstats.patch mm-vmscan-move-lru_lock-to-the-node.patch mm-vmscan-move-lru-lists-to-node.patch mm-mmzone-clarify-the-usage-of-zone-padding.patch mm-vmscan-begin-reclaiming-pages-on-a-per-node-basis.patch mm-vmscan-have-kswapd-only-scan-based-on-the-highest-requested-zone.patch mm-vmscan-make-kswapd-reclaim-in-terms-of-nodes.patch mm-vmscan-remove-balance-gap.patch mm-vmscan-simplify-the-logic-deciding-whether-kswapd-sleeps.patch mm-vmscan-by-default-have-direct-reclaim-only-shrink-once-per-node.patch mm-vmscan-remove-duplicate-logic-clearing-node-congestion-and-dirty-state.patch mm-vmscan-do-not-reclaim-from-kswapd-if-there-is-any-eligible-zone.patch mm-vmscan-make-shrink_node-decisions-more-node-centric.patch mm-memcg-move-memcg-limit-enforcement-from-zones-to-nodes.patch mm-workingset-make-working-set-detection-node-aware.patch mm-page_alloc-consider-dirtyable-memory-in-terms-of-nodes.patch mm-move-page-mapped-accounting-to-the-node.patch mm-rename-nr_anon_pages-to-nr_anon_mapped.patch mm-move-most-file-based-accounting-to-the-node.patch mm-move-vmscan-writes-and-file-write-accounting-to-the-node.patch mm-vmscan-only-wakeup-kswapd-once-per-node-for-the-requested-classzone.patch mm-page_alloc-wake-kswapd-based-on-the-highest-eligible-zone.patch mm-convert-zone_reclaim-to-node_reclaim.patch mm-vmscan-avoid-passing-in-classzone_idx-unnecessarily-to-shrink_node.patch mm-vmscan-avoid-passing-in-classzone_idx-unnecessarily-to-compaction_ready.patch mm-vmscan-avoid-passing-in-classzone_idx-unnecessarily-to-compaction_ready-fix.patch mm-vmscan-avoid-passing-in-remaining-unnecessarily-to-prepare_kswapd_sleep.patch mm-vmscan-have-kswapd-reclaim-from-all-zones-if-reclaiming-and-buffer_heads_over_limit.patch mm-vmscan-have-kswapd-reclaim-from-all-zones-if-reclaiming-and-buffer_heads_over_limit-fix.patch mm-vmscan-add-classzone-information-to-tracepoints.patch mm-page_alloc-remove-fair-zone-allocation-policy.patch mm-page_alloc-cache-the-last-node-whose-dirty-limit-is-reached.patch mm-vmstat-replace-__count_zone_vm_events-with-a-zone-id-equivalent.patch mm-vmstat-account-per-zone-stalls-and-pages-skipped-during-reclaim.patch mm-vmstat-account-per-zone-stalls-and-pages-skipped-during-reclaim-fix.patch mm-vmstat-print-node-based-stats-in-zoneinfo-file.patch mm-vmstat-remove-zone-and-node-double-accounting-by-approximating-retries.patch mm-vmstat-remove-zone-and-node-double-accounting-by-approximating-retries-fix.patch mm-pagevec-release-reacquire-lru_lock-on-pgdat-change.patch mm-vmscan-update-all-zone-lru-sizes-before-updating-memcg.patch mm-vmscan-remove-redundant-check-in-shrink_zones.patch mm-vmscan-release-reacquire-lru_lock-on-pgdat-change.patch mm-vmscan-release-reacquire-lru_lock-on-pgdat-change-fix.patch mm-add-per-zone-lru-list-stat-fix.patch mm-vmscan-remove-highmem_file_pages.patch mm-vmscan-remove-highmem_file_pages-fix.patch mm-remove-reclaim-and-compaction-retry-approximations.patch mm-consider-whether-to-decivate-based-on-eligible-zones-inactive-ratio.patch mm-vmscan-account-for-skipped-pages-as-a-partial-scan.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