From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Oct 2017 16:03:08 +0000 (-0700)
Subject: Merge branch 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.14-rc4~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bf2db0b9f5808fa5b78141b68d55ec630bf06313;p=users%2Fhch%2Fblock.git

Merge branch 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "Two more fixes for bugs introduced in 4.13.

  The sector_t problem with 32bit architecture and !LBDAF config seems
  serious but the number of affected deployments is hopefully low.

  The clashing status bits could lead to a confusing in-memory state of
  the whole-filesystem operations if used with the quota override sysfs
  knob"

* 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix overlap of fs_info::flags values
  btrfs: avoid overflow when sector_t is 32 bit
---

bf2db0b9f5808fa5b78141b68d55ec630bf06313