From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 May 2016 01:44:24 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v4.6~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a2ccb68b1e6add42c0bf3ade73cd11c98d32b890;p=linux.git

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
---

a2ccb68b1e6add42c0bf3ade73cd11c98d32b890