diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-24 00:11:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-24 00:11:11 +0200 |
commit | ed4a1084bc8dc47328392aa31e0bc04eb2dbffbb (patch) | |
tree | adf2543a5c7149c6287d7f03ecca1bffcb6395b2 /mm/slab_common.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | mm: hugetlb: fix copy_hugetlb_page_range() (diff) | |
download | linux-ed4a1084bc8dc47328392aa31e0bc04eb2dbffbb.tar.xz linux-ed4a1084bc8dc47328392aa31e0bc04eb2dbffbb.zip |
Merge branch 'akpm' (patches from Andrew Morton)
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
Diffstat (limited to 'mm/slab_common.c')
0 files changed, 0 insertions, 0 deletions