From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Mar 2018 20:01:45 +0000 (-0800)
Subject: Merge tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.16-rc5~30
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0;p=linux.git

Merge tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/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)
---

ea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0