Merge tag 'vfs-5.7-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2020 19:59:36 +0000 (12:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2020 19:59:36 +0000 (12:59 -0700)
commit7db83c070bd29e73c8bb42d4b48c976be76f1dbe
tree463129a0ebe1812b7c699fa5911238389005dae1
parent35a9fafe230bdefe3c37b06589bf622c857030c1
parent56939e014a6c212b317414faa307029e2e80c3b9
Merge tag 'vfs-5.7-merge-1' of git://git./fs/xfs/xfs-linux

Pull hibernation fix from Darrick Wong:
 "Fix a regression where we broke the userspace hibernation driver by
  disallowing writes to the swap device"

* tag 'vfs-5.7-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  hibernate: Allow uswsusp to write to swap
fs/block_dev.c