]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9489e9d 25389bb)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Nov 2012 01:42:07 +0000 (17:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Nov 2012 01:42:07 +0000 (17:42 -0800)
commit87726c334bf11188260a3af90a6ccbfe907498cb
treecc6ef138e30e892cad9aabf732cdbb1762058fd2tree
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17commit | diff
parent25389bb207987b5774182f763b9fb65ff08761c8commit | diff
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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()
Ubuntu combined Linux kernel mirror