]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2016 17:54:34 +0000 (09:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2016 17:54:34 +0000 (09:54 -0800)
commitc5288b6e3bd976baaea2c9bb5c033b2e980fd1c2
treebadf5fa97da02eab53826465ea9da21079eac0dc
parenteb62a09ee85bcd9f5f65713082e3c79a5d4fecf9
parent87d6fdfd1057e1caddc5095e921a94cb6e80459e
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "Six fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock
  reiserfs: fix dereference of ERR_PTR
  ratelimit: fix bug in time interval by resetting right begin time
  mm: fix kernel crash in khugepaged thread
  mm: fix mlock accouting
  thp: change pmd_trans_huge_lock() interface to return ptl