From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jun 2018 22:23:00 +0000 (+0900)
Subject: Merge tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7655d2b25466c534ed1f539367dae595bb0bd20;p=linux.git

Merge tag 'for-4.18-part2-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:

 - error handling fixup for one of the new ioctls from 1st pull

 - fix for device-replace that incorrectly uses inode pages and can mess
   up compressed extents in some cases

 - fiemap fix for reporting incorrect number of extents

 - vm_fault_t type conversion

* tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: scrub: Don't use inode pages for device replace
  btrfs: change return type of btrfs_page_mkwrite to vm_fault_t
  Btrfs: fiemap: pass correct bytenr when fm_extent_count is zero
  btrfs: Check error of btrfs_iget in btrfs_search_path_in_tree_user
---

e7655d2b25466c534ed1f539367dae595bb0bd20