diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 09:05:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 09:05:33 -0800 |
commit | d3ba7afcc11fe9146def1664c32762d5a6a47713 (patch) | |
tree | 0c73052bd2dcb380d3117952ec5456d9c2a66577 /fs/cifs/cifssmb.c | |
parent | 585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba (diff) | |
parent | d196e229a80c39254f4adbc312f55f5198e98941 (diff) |
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 'fs/cifs/cifssmb.c')
0 files changed, 0 insertions, 0 deletions