From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Sep 2019 00:35:20 +0000 (-0700)
Subject: Merge tag 'vfs-5.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: for-linus-2019-09-27~81
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e6bc9de714972cac34daa1dc1567ee48a47a9342;p=linux-2.6-block.git

Merge tag 'vfs-5.4-merge-1' of git://git./fs/xfs/xfs-linux

Pull swap access updates from Darrick Wong:
 "Prohibit writing to active swap files and swap partitions.

  There's no non-malicious use case for allowing userspace to scribble
  on storage that the kernel thinks it owns"

* tag 'vfs-5.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  vfs: don't allow writes to swap files
  mm: set S_SWAPFILE on blockdev swap devices
---

e6bc9de714972cac34daa1dc1567ee48a47a9342