projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e0600f 88bc0ed)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <[email protected]>
Thu, 30 Nov 2017 23:38:47 +0000 (18:38 -0500)
committerLinus Torvalds <[email protected]>
Thu, 30 Nov 2017 23:38:47 +0000 (18:38 -0500)
commit9c41180be47a6c08105894e1289182995749fc9a
treee623a0c416b3c25f9f0a277c063e985539ad33betree | snapshot
parent9e0600f5cf6cecfcab5046d1453a9538c054d8a7commit | diff
parent88bc0ede8d35edc969350852894dc864a2dc1859commit | diff
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
fs/reiserfs/super.c diff1 | diff2 | blob | history
John Crispins staging tree