tree badf5fa97da02eab53826465ea9da21079eac0dc
parent 3e1e21c7bfcfa9bf06c07f48a13faca2f62b3339
parent b1b1e15ef6b80facf76d6757649dfd7295eda29f
author Linus Torvalds <torvalds@linux-foundation.org> 1453485274 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1453485274 -0800

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