Commit ca5a955c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 37c9875c ("exfat: fix potential wrong error return from get_block") into android16-6.12 



Steps on the way to 6.12.23

Resolves merge conflicts in:
        fs/exfat/inode.c

Change-Id: I275fdf7fa341a06b0bec16266176f8785acff8a7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1f20a704 37c9875c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment