From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Mar 2021 17:37:30 +0000 (-0700)
Subject: Merge branch 'iomap-5.12-fixes' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8ff0f3bf5d6513dfb7462246d9c656da7c02b37e;p=uclinux-h8%2Flinux.git

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
---

8ff0f3bf5d6513dfb7462246d9c656da7c02b37e