more ext4 fixes for v5.10-rc4

The following changes since commit 52d1998d09af92d44ffce7454637dd3fd1afdc7d:

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt (2020-11-10 10:05:37 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus_bugfixes

for you to fetch changes up to d196e229a80c39254f4adbc312f55f5198e98941:

Revert "ext4: fix superblock checksum calculation race" (2020-11-11 14:24:18 -0500)

----------------------------------------------------------------
Two ext4 bug fixes, one via a revert of a commit sent during the merge window.

----------------------------------------------------------------
Harshad Shirwadkar (1):
ext4: handle dax mount option collision

Theodore Ts'o (1):
Revert "ext4: fix superblock checksum calculation race"

 fs/ext4/ext4.h  |  6 +++---
 fs/ext4/super.c | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)