Merge tag 'xfs-4.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Aug 2017 01:16:22 +0000 (18:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Aug 2017 01:16:22 +0000 (18:16 -0700)
commit1742c0f0554ec9a463f859a63ef0a7ba0a45310a
treebf64b839c622a9ace760242cb2eed050cd72b0a7
parentaae4e7a8bc44722fe70d58920a36916b1043195e
parent56bdf855e676f1f2ed7033f288f57dfd315725ba
Merge tag 'xfs-4.13-fixes-3' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "I have a couple more bug fixes for you today:

   - fix memory leak when issuing discard

   - fix propagation of the dax inode flag"

* tag 'xfs-4.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: Fix per-inode DAX flag inheritance
  xfs: Fix leak of discard bio