From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Aug 2021 18:05:11 +0000 (-0700)
Subject: Merge tag 'for-5.14-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v5.15~517
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b49ceb8545b8eca68c03388a07ecca7caa5d9c1;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-5.14-rc7-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "One more fix that I think qualifies for a late merge. It's a revert of
  a one-liner fix that meanwhile got backported to stable kernels and we
  got reports from users.

  The broken fix prevents creating compressed inline extents, which
  could be noticeable on space consumption.

  Technically it's a regression as the patch was merged in 5.14-rc1 but
  got propagated to several stable kernels and has higher exposure than
  a 'typical' development cycle bug"

* tag 'for-5.14-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Revert "btrfs: compression: don't try to compress if we don't have enough pages"
---

9b49ceb8545b8eca68c03388a07ecca7caa5d9c1