Merge branch 'iomap-5.12-fixes' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2021 17:37:30 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2021 17:37:30 +0000 (10:37 -0700)
commit8ff0f3bf5d6513dfb7462246d9c656da7c02b37e
tree03e889ee36115d505b2dc822a907f5e4cbed1b91
parent6417f03132a6952cd17ddd8eaddbac92b61b17e0
parent5808fecc572391867fcd929662b29c12e6d08d81
Merge branch 'iomap-5.12-fixes' of git://git./fs/xfs/xfs-linux

Pull iomap fix from Darrick Wong:
 "A single fix to the iomap code which fixes some drama when someone
  gives us a {de,ma}liciously fragmented swap file"

* 'iomap-5.12-fixes' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate