Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton: - a few misc things - ocfs2 updates - the v9fs maintainers have been missing for a long time. I've taken over v9fs patch slinging. - most of MM * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (116 commits) mm,oom_reaper: check for MMF_OOM_SKIP before complaining mm/ksm: fix interaction with THP mm/memblock.c: cast constant ULLONG_MAX to phys_addr_t headers: untangle kmemleak.h from mm.h include/linux/mmdebug.h: make VM_WARN* non-rvals mm/page_isolation.c: make start_isolate_page_range() fail if already isolated mm: change return type to vm_fault_t mm, oom: remove 3% bonus for CAP_SYS_ADMIN processes mm, page_alloc: wakeup kcompactd even if kswapd cannot free more memory kernel/fork.c: detect early free of a live mm mm: make counting of list_lru_one::nr_items lockless mm/swap_state.c: make bool enable_vma_readahead and swap_vma_readahead() static block_invalidatepage(): only release page if the full page was invalidated mm: kernel-doc: add missing parameter descriptions mm/swap.c: remove @cold parameter description for release_pages() mm/nommu: remove description of alloc_vm_area zram: drop max_zpage_size and use zs_huge_class_size() zsmalloc: introduce zs_huge_class_size() mm: fix races between swapoff and flush dcache fs/direct-io.c: minor cleanups in do_blockdev_direct_IO ...
No related branches found
No related tags found
Showing
- Documentation/admin-guide/kernel-parameters.txt 27 additions, 27 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/trace/postprocess/trace-vmscan-postprocess.pl 2 additions, 2 deletionsDocumentation/trace/postprocess/trace-vmscan-postprocess.pl
- arch/arc/mm/cache.c 1 addition, 1 deletionarch/arc/mm/cache.c
- arch/arm/boot/compressed/misc.c 1 addition, 8 deletionsarch/arm/boot/compressed/misc.c
- arch/arm/mm/copypage-v4mc.c 1 addition, 1 deletionarch/arm/mm/copypage-v4mc.c
- arch/arm/mm/copypage-v6.c 1 addition, 1 deletionarch/arm/mm/copypage-v6.c
- arch/arm/mm/copypage-xscale.c 1 addition, 1 deletionarch/arm/mm/copypage-xscale.c
- arch/arm/mm/fault-armv.c 1 addition, 1 deletionarch/arm/mm/fault-armv.c
- arch/arm/mm/flush.c 3 additions, 3 deletionsarch/arm/mm/flush.c
- arch/mips/boot/compressed/decompress.c 1 addition, 8 deletionsarch/mips/boot/compressed/decompress.c
- arch/mips/mm/cache.c 1 addition, 1 deletionarch/mips/mm/cache.c
- arch/nios2/mm/cacheflush.c 2 additions, 2 deletionsarch/nios2/mm/cacheflush.c
- arch/parisc/kernel/cache.c 3 additions, 2 deletionsarch/parisc/kernel/cache.c
- arch/powerpc/include/asm/hugetlb.h 0 additions, 6 deletionsarch/powerpc/include/asm/hugetlb.h
- arch/powerpc/mm/hugetlbpage.c 1 addition, 4 deletionsarch/powerpc/mm/hugetlbpage.c
- arch/powerpc/mm/mmu_context_iommu.c 1 addition, 1 deletionarch/powerpc/mm/mmu_context_iommu.c
- arch/powerpc/sysdev/dart_iommu.c 1 addition, 0 deletionsarch/powerpc/sysdev/dart_iommu.c
- arch/powerpc/sysdev/msi_bitmap.c 1 addition, 0 deletionsarch/powerpc/sysdev/msi_bitmap.c
- arch/s390/kernel/nmi.c 1 addition, 1 deletionarch/s390/kernel/nmi.c
- arch/s390/kernel/smp.c 0 additions, 1 deletionarch/s390/kernel/smp.c
Loading
Please register or sign in to comment