From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 1 Jul 2018 19:38:16 +0000 (-0700)
Subject: Merge tag 'for-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.18-rc3~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d3bc0e67f8525760479e88a51e87bb0c026e40f3;p=users%2Fdwmw2%2Flinux.git

Merge tag 'for-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "We have a few regression fixes for qgroup rescan status tracking and
  the vm_fault_t conversion that mixed up the error values"

* tag 'for-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix mount failure when qgroup rescan is in progress
  Btrfs: fix regression in btrfs_page_mkwrite() from vm_fault_t conversion
  btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf
---

d3bc0e67f8525760479e88a51e87bb0c026e40f3