]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2016 01:44:24 +0000 (18:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2016 01:44:24 +0000 (18:44 -0700)
commitf9180a000e3a714ebad302a94e56fe5c9b84877c
tree03addb13529482fdc635ff7a916dd4e1c79ffbfb
parentc54cc5691cd3a18cced0cbf756e31ba7a61c4861
parent335839ccb310431ea1f6eb9d186d79ae22b04c07
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