Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "7 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, swap: fix race between swap count continuation operations mm/huge_memory.c: deposit page table when copying a PMD migration entry initramfs: fix initramfs rebuilds w/ compression after disabling fs/hugetlbfs/inode.c: fix hwpoison reserve accounting ocfs2: fstrim: Fix start offset of first cluster group during fstrim mm, /proc/pid/pagemap: fix soft dirty marking for PMD migration entry userfaultfd: hugetlbfs: prevent UFFDIO_COPY to fill beyond the end of i_size
Showing
- fs/hugetlbfs/inode.c 4 additions, 1 deletionfs/hugetlbfs/inode.c
- fs/ocfs2/alloc.c 18 additions, 6 deletionsfs/ocfs2/alloc.c
- fs/proc/task_mmu.c 5 additions, 1 deletionfs/proc/task_mmu.c
- include/linux/swap.h 4 additions, 0 deletionsinclude/linux/swap.h
- mm/huge_memory.c 3 additions, 0 deletionsmm/huge_memory.c
- mm/hugetlb.c 30 additions, 2 deletionsmm/hugetlb.c
- mm/swapfile.c 17 additions, 6 deletionsmm/swapfile.c
- usr/Makefile 5 additions, 4 deletionsusr/Makefile
Please register or sign in to comment