Merge branch 'akpm' (patches from Andrew Morton)

Browse source

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: hugetlb: fix copy_hugetlb_page_range()
  simple_xattr: permit 0-size extended attributes
  mm/fs: fix pessimization in hole-punching pagecache
  shmem: fix splicing from a hole while it's punched
  shmem: fix faulting into a hole, not taking i_mutex
  mm: do not call do_fault_around for non-linear fault
  sh: also try passing -m4-nofpu for SH2A builds
  zram: avoid lockdep splat by revalidate_disk
  mm/rmap.c: fix pgoff calculation to handle hugepage correctly
  coredump: fix the setting of PF_DUMPCORE

...

This commit is contained in:

Linus Torvalds 2014-07-23 15:11:11 -07:00

parent 15ba2236f3 0253d634e0

commit ed4a1084bc

11 changed files with 117 additions and 55 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

3

arch/sh/Makefile

View file

22

drivers/block/zram/zram_drv.c

View file

2

fs/coredump.c

View file

2

fs/xattr.c

View file

12

include/linux/pagemap.h

View file

1

mm/hugetlb.c

View file

4

mm/memory-failure.c

View file

3

mm/memory.c

View file

10

mm/rmap.c

View file

102

mm/shmem.c

View file

11

mm/truncate.c

View file