From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jun 2018 15:41:54 +0000 (-0700)
Subject: Merge tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.19~717
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84bfed40fc25dd052620398fdcc19d8c77f02270;p=platform%2Fkernel%2Flinux-rpi.git

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
---

84bfed40fc25dd052620398fdcc19d8c77f02270