From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Nov 2017 23:38:47 +0000 (-0500)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v4.19~2063
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c41180be47a6c08105894e1289182995749fc9a;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull quota & reiserfs changes from Jan Kara:

 - two error checking improvements for quota

 - remove bogus i_version increase for reiserfs

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Check for register_shrinker() failure.
  quota: propagate error from __dquot_initialize
  reiserfs: remove unneeded i_version bump
---

9c41180be47a6c08105894e1289182995749fc9a