From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2021 19:06:42 +0000 (-0700)
Subject: Merge tag 'for-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v5.14-rc7~22
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d6d09a6942050f21b065a134169002b4d6b701ef;p=tomoyo%2Ftomoyo-test1.git

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

Pull btrfs fix from David Sterba:
 "One more fix for cross-rename, adding a missing check for directory
  and subvolume, this could lead to a crash"

* tag 'for-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: prevent rename2 from exchanging a subvol with a directory from different parents
---

d6d09a6942050f21b065a134169002b4d6b701ef