From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jun 2019 01:10:15 +0000 (-1000)
Subject: Merge tag 'for-5.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v5.15~6186
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fa425a2651515f8d262f2c1d972c6632e7c941d;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull btrfs fix from David Sterba:
 "One regression fix to TRIM ioctl.

  The range cannot be used as its meaning can be confusing regarding
  physical and logical addresses. This confusion in code led to
  potential corruptions when the range overlapped data.

  The original patch made it to several stable kernels and was promptly
  reverted, the version for master branch is different due to additional
  changes but the change is effectively the same"

* tag 'for-5.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: Always trim all unallocated space in btrfs_trim_free_extents
---

6fa425a2651515f8d262f2c1d972c6632e7c941d