On Sun, Apr 13, 2025 at 10:27:18AM +0530, Kevin Paul Reddy Janagari wrote:
> commit 985b67cd8639 ("ext4: filesystems without casefold feature cannot be
> mounted with siphash") upstream
>
> CONFLICT: A condition above this was wrapped in #ifdef making git not
> able to merge them: Merge conflict
>
> When mounting the ext4 filesystem, if the default hash version is set to
> DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting.
>
> compile tested
> Signed-off-by: Kevin Paul Reddy Janagari <kevinpaul468@xxxxxxxxx>
I believe the problem you are concerned with was fixed by commit
a2187431c395 ("ext4: fix error message when rejecting the default
hash")
And I'm not sure what you meant by your reference to the merge
conflict? Were you trying to cherry-pick 985b67cd8639 into some other
tree or branch, and that was where you saw the merge conflict?
- Ted
