From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Dec 2017 04:15:49 +0000 (-0800)
Subject: Merge tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v4.15-rc4~35
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7c5cac1bc7170bfc726a69eb64947c55658d16ad;p=linux-block.git

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

Pull xfs fixes from Darrick Wong:
 "Here are a few more bug fixes & cleanups for 4.15-rc4:

   - clean up duplicate includes

   - remove ancient 'no-alloc' crap code that occasionally caused hard
     fs shutdowns due to lack of proper space reservations

   - fix regression in FIEMAP behavior when reporting xattr extents"

* tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: make iomap_begin functions trim iomaps consistently
  xfs: remove "no-allocation" reservations for file creations
  fs: xfs: remove duplicate includes
---

7c5cac1bc7170bfc726a69eb64947c55658d16ad