From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 May 2018 19:04:27 +0000 (-0700)
Subject: Merge tag 'for-4.17-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v5.15~8825
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5e03ad9e0f04cb3f478b914a3bf9c8f77ee9e94;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-4.17-rc5-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "We've accumulated some fixes during the last week, some of them were
  in the works for a longer time but there are some newer ones too.

  Most of the fixes have a reproducer and fix user visible problems,
  also candidates for stable kernels. They IMHO qualify for a late rc,
  though I did not expect that many"

* tag 'for-4.17-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix crash when trying to resume balance without the resume flag
  btrfs: Fix delalloc inodes invalidation during transaction abort
  btrfs: Split btrfs_del_delalloc_inode into 2 functions
  btrfs: fix reading stale metadata blocks after degraded raid1 mounts
  btrfs: property: Set incompat flag if lzo/zstd compression is set
  Btrfs: fix duplicate extents after fsync of file with prealloc extents
  Btrfs: fix xattr loss after power failure
  Btrfs: send, fix invalid access to commit roots due to concurrent snapshotting
---

e5e03ad9e0f04cb3f478b914a3bf9c8f77ee9e94