From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Apr 2019 21:19:02 +0000 (-0700)
Subject: Merge tag 'for-5.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2d06b235815e6bd20395f3db9ada786a6f7a876e;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-5.1-rc4-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:

 - fix parsing of compression algorithm when set as a inode property,
   this could end up with eg. 'zst' or 'zli' in the value

 - don't allow trim on a filesystem with unreplayed log, this could
   cause data loss if there are pending updates to the block groups that
   would not be subject to trim after replay

* tag 'for-5.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: prop: fix vanished compression property after failed set
  btrfs: prop: fix zstd compression parameter validation
  Btrfs: do not allow trimming when a fs is mounted with the nologreplay option
---

2d06b235815e6bd20395f3db9ada786a6f7a876e