From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Apr 2021 19:27:23 +0000 (-0700)
Subject: Merge tag 'iomap-5.13-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: microblaze-v5.14~143
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=b34b95ebbba9a10257e3a2c9b2ba4119cb345dc3;p=linux-2.6-microblaze.git

Merge tag 'iomap-5.13-merge-2' of git://git./fs/xfs/xfs-linux

Pull iomap update from Darrick Wong:
 "A single patch to the iomap code, which augments what gets logged when
  someone tries to swapon an unacceptable swap file. (Yes, this is a
  continuation of the swapfile drama from last season...)"

* tag 'iomap-5.13-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: improve the warnings from iomap_swapfile_activate
---

b34b95ebbba9a10257e3a2c9b2ba4119cb345dc3