diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 18:05:33 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 18:05:33 +0100 |
commit | d3ba7afcc11fe9146def1664c32762d5a6a47713 (patch) | |
tree | 0c73052bd2dcb380d3117952ec5456d9c2a66577 /kernel | |
parent | Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt (diff) | |
parent | Revert "ext4: fix superblock checksum calculation race" (diff) | |
download | linux-d3ba7afcc11fe9146def1664c32762d5a6a47713.tar.xz linux-d3ba7afcc11fe9146def1664c32762d5a6a47713.zip |
Merge tag 'ext4_for_linus_bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fixes from Ted Ts'o:
"Two ext4 bug fixes, one being a revert of a commit sent during the
merge window"
* tag 'ext4_for_linus_bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
Revert "ext4: fix superblock checksum calculation race"
ext4: handle dax mount option collision
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions