Merge tag 'ext4_for_linus_bugfixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Nov 2020 17:05:33 +0000 (09:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Nov 2020 17:05:33 +0000 (09:05 -0800)
commitd3ba7afcc11fe9146def1664c32762d5a6a47713
tree0c73052bd2dcb380d3117952ec5456d9c2a66577
parent585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba
parentd196e229a80c39254f4adbc312f55f5198e98941
Merge tag 'ext4_for_linus_bugfixes' of git://git./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