From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jun 2017 19:23:06 +0000 (-0700)
Subject: Merge tag 'xfs-4.12-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b249bdc3dec656b87bc569d4adcccbfbd525ec1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'xfs-4.12-fixes-5' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "I have one more bugfix for you for 4.12-rc7 to fix a disk corruption
  problem:

   - don't allow swapon on files on the realtime device, because the
     swap code will swap pages out to blocks on the data device, thereby
     corrupting the filesystem"

* tag 'xfs-4.12-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: don't allow bmap on rt files
---

7b249bdc3dec656b87bc569d4adcccbfbd525ec1