]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge tag 'xfs-4.18-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Aug 2018 01:30:58 +0000 (18:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Aug 2018 01:30:58 +0000 (18:30 -0700)
Pull xfs bugfix from Darrick Wong:
 "One more patch for 4.18 to fix a coding error in the iomap_bmap()
  function introduced in -rc1: fix incorrect shifting"

* tag 'xfs-4.18-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  fs: fix iomap_bmap position calculation


Trivial merge