]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Jan 2013 17:22:50 +0000 (09:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Jan 2013 17:22:50 +0000 (09:22 -0800)
Pull ext4 regression fixes from Ted Ts'o:
 "Bug fixes, including two regressions introduced in v3.8.  The most
  serious of these regressions is a buffer cache leak."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: remove duplicate call to ext4_bread() in ext4_init_new_dir()
  ext4: release buffer in failed path in dx_probe()
  ext4: fix configuration dependencies for ext4 ACLs and security labels


Trivial merge