]> www.infradead.org Git - nvme.git/commit
projects / nvme.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: a4f7fae ad89b66)
Merge tag 'iomap-5.13-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2021 19:27:23 +0000 (12:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2021 19:27:23 +0000 (12:27 -0700)
commitb34b95ebbba9a10257e3a2c9b2ba4119cb345dc3
tree788e2a9bb837120476bbbbaf370cd92d04f87652tree
parenta4f7fae10169cf626bb83e97f229ee78c71ceea8commit | diff
parentad89b66cbad18ca146cbc75f64706d4ca6635973commit | 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
Unnamed repository; edit this file 'description' to name the repository.