]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jul 2013 03:11:42 +0000 (20:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jul 2013 03:11:42 +0000 (20:11 -0700)
Pull ext[34] tmpfile bugfix from Ted Ts'o:
 "Fix regression caused by commit af51a2ac36d1f which added ->tmpfile()
  support (along with a similar fix for ext3)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext3: fix a BUG when opening a file with O_TMPFILE flag
  ext4: fix a BUG when opening a file with O_TMPFILE flag


Trivial merge