Merge tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
commitea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Mar 2018 20:01:45 +0000 (7 12:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Mar 2018 20:01:45 +0000 (7 12:01 -0800)
tree097441edab30bdcfaf65d2e7235e6c2a4c506495
parent69f39c570561bb49efcaaf58e0dd96d90f5fc571
parent3b5da96e4585a2788da6a07619bda3518d76eb30
Merge tag 'gfs2-4.16.rc4.fixes' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 fix from Bob Peterson:
 "An additional patch from Andreas Gruenbacher that fixes another
  unfortunate GFS2 regression"

* tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fixes to "Implement iomap for block_map" (2)