| commit | d6d09a6942050f21b065a134169002b4d6b701ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 12:06:42 2021 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 12:06:42 2021 -0700 |
| tree | d9485cbc7212e873476377d36c279a15e9fd0f07 | |
| parent | 01f15f3773bf3653a708e2c18c370beb16ca23c7 [diff] | |
| parent | 3f79f6f6247c83f448c8026c3ee16d4636ef8d4f [diff] |
Merge tag 'for-5.14-rc6-tag' of git://git.kernel.org/pub/scm/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