tree 0e82d0824f8cfb7c3d1aca5e1bb44c3bc6f1c23a
parent b77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5
parent 69ad59767d094752c23c0fc180a79532fde073d0
author Linus Torvalds <torvalds@linux-foundation.org> 1507305788 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1507305788 -0700

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