From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Nov 2012 01:42:07 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87726c334bf11188260a3af90a6ccbfe907498cb;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull ext3 regression fix from Jan Kara:
 "Fix an ext3 regression introduced during 3.7 merge window.  It leads
  to deadlock if you stress the filesystem in the right way (luckily
  only if blocksize < pagesize)."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  jbd: Fix lock ordering bug in journal_unmap_buffer()
---

87726c334bf11188260a3af90a6ccbfe907498cb