Mainly include two patchset and bugfix: 1. mm: enable large folios swap-in support 2. More swap folio conversions Andy Shevchenko (1): mm: remove unused stub for can_swapin_thp() Barry Song (4): mm: add nr argument in mem_cgroup_swapin_uncharge_swap() helper to support large folios mm: zswap: fix zswap_never_enabled() for CONFIG_ZSWAP==N mm: fix PSWPIN counter for large folios swap-in mm: add per-order mTHP swpin counters Chuanhua Han (1): mm: support large folios swap-in for sync io devices Matthew Wilcox (Oracle) (13): mm: return the folio from __read_swap_cache_async() mm: pass a folio to __swap_writepage() mm: pass a folio to swap_writepage_fs() mm: pass a folio to swap_writepage_bdev_sync() mm: pass a folio to swap_writepage_bdev_async() mm: pass a folio to swap_readpage_fs() mm: pass a folio to swap_readpage_bdev_sync() mm: pass a folio to swap_readpage_bdev_async() mm: convert swap_page_sector() to swap_folio_sector() mm: convert swap_readpage() to swap_read_folio() mm: remove page_swap_info() mm: return a folio from read_swap_cache_async() mm: convert swap_cluster_readahead and swap_vma_readahead to return a folio Wenchao Hao (1): mm: add per-order mTHP swap-in fallback/fallback_charge counters Yosry Ahmed (1): mm: zswap: add zswap_never_enabled() Documentation/admin-guide/mm/transhuge.rst | 14 ++ include/linux/huge_mm.h | 3 + include/linux/memcontrol.h | 5 +- include/linux/mmzone.h | 1 + include/linux/swap.h | 5 +- include/linux/zswap.h | 6 + mm/huge_memory.c | 9 + mm/madvise.c | 22 +- mm/memcontrol.c | 7 +- mm/memory.c | 264 ++++++++++++++++++--- mm/page_io.c | 86 +++---- mm/shmem.c | 8 +- mm/swap.h | 23 +- mm/swap_state.c | 76 +++--- mm/swapfile.c | 16 +- mm/zswap.c | 62 +++-- 16 files changed, 423 insertions(+), 184 deletions(-) -- 2.25.1