| commit | a2ccb68b1e6add42c0bf3ade73cd11c98d32b890 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 18:44:24 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 18:44:24 2016 -0700 |
| tree | 03addb13529482fdc635ff7a916dd4e1c79ffbfb | |
| parent | 02c9c0e9b9d9e26f56aa74245c1a5a843878f899 [diff] | |
| parent | 6d0a07edd17cfc12fdc1f36de8072fa17cc3666f [diff] |
Merge branch 'akpm' (patches from Andrew) Merge fixes from Andrew Morton: "4 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: thp: calculate the mapcount correctly for THP pages during WP faults ksm: fix conflict between mmput and scan_get_next_rmap_item ocfs2: fix posix_acl_create deadlock ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang