]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 113fcf6 f9479a5)
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)
commit3f2eb56762a8f88527bb674812327d17d249e5ac
tree03addb13529482fdc635ff7a916dd4e1c79ffbfbtree | snapshot
parent113fcf63d0ef4105f5bac9cfe163e18c5b31dd7ecommit | diff
parentf9479a58c9911553349105f1dbe41fbaccfb3e7acommit | 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
Linux Kernel Source Tree.