commit | b34b95ebbba9a10257e3a2c9b2ba4119cb345dc3 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 12:27:23 2021 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 12:27:23 2021 -0700 |
tree | 788e2a9bb837120476bbbbaf370cd92d04f87652 | |
parent | a4f7fae10169cf626bb83e97f229ee78c71ceea8 [diff] | |
parent | ad89b66cbad18ca146cbc75f64706d4ca6635973 [diff] |
Merge tag 'iomap-5.13-merge-2' of git://git.kernel.org/pub/scm/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