Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Sep 2017 19:22:12 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Sep 2017 19:22:12 +0000 (12:22 -0700)
commit9cd6681cb1169e815c41af0265165dd1b872f228
tree9c2c26d366be9cc5cbb1888da24bf0343813b71d
parent225d3b67482930ff5a9f49ad307deffd97ce04c1
parent4c6bb69663b3a3f2db8f488356e96acb5460f25f
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull quota and isofs fixes from Jan Kara:
 "Two quota fixes (fallout of the quota locking changes) and an isofs
  build fix"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Fix quota corruption with generic/232 test
  isofs: fix build regression
  quota: add missing lock into __dquot_transfer()