Merge branch 'akpm' (patches from Andrew)

Browse source

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

...

This commit is contained in:

Linus Torvalds 2017-11-03 09:03:50 -07:00

parent fb615d61b5 2628bd6fc0

commit f0395d5b4d

8 changed files with 86 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

fs/hugetlbfs/inode.c

View file

24

fs/ocfs2/alloc.c

View file

6

fs/proc/task_mmu.c

View file

4

include/linux/swap.h

View file

3

mm/huge_memory.c

View file

32

mm/hugetlb.c

View file

23

mm/swapfile.c

View file

9

usr/Makefile

View file