OSDN Git Service

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)
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


Trivial merge