git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01f15f3 3f79f6f)
Merge tag 'for-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2021 19:06:42 +0000 (12:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2021 19:06:42 +0000 (12:06 -0700)
commitd6d09a6942050f21b065a134169002b4d6b701ef
treed9485cbc7212e873476377d36c279a15e9fd0f07tree
parent01f15f3773bf3653a708e2c18c370beb16ca23c7commit | diff
parent3f79f6f6247c83f448c8026c3ee16d4636ef8d4fcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.