Merge tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2018 15:41:54 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2018 15:41:54 +0000 (08:41 -0700)
commit84bfed40fc25dd052620398fdcc19d8c77f02270
treee0a8c7df159edfdc745b91de2c8158f939c31e03
parent6f0d349d922ba44e4348a17a78ea51b7135965b1
parentc5b4a50b74018b3677098151ec5f4fce07d5e6a0
Merge tag 'for-4.18-rc1-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "Two regression fixes and an incorrect error value propagation fix from
  'rename exchange'"

* tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix return value on rename exchange failure
  btrfs: fix invalid-free in btrfs_extent_same
  Btrfs: fix physical offset reported by fiemap for inline extents
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c