From: Linus Torvalds Date: Fri, 22 Jan 2016 17:54:34 +0000 (-0800) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6fb11e6508eac9d2e01ba748fc13afdd657224ab;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'akpm' (patches from Andrew) Merge misc fixes from Andrew Morton: "Six fixes" * emailed patches from Andrew Morton : 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 --- 6fb11e6508eac9d2e01ba748fc13afdd657224ab