From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Nov 2020 17:05:33 +0000 (-0800)
Subject: Merge tag 'ext4_for_linus_bugfixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.10.7~1184
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3ba7afcc11fe9146def1664c32762d5a6a47713;p=platform%2Fkernel%2Flinux-rpi.git

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

d3ba7afcc11fe9146def1664c32762d5a6a47713