Commit b74222ab authored by yenchia.chen's avatar yenchia.chen Committed by Treehugger Robot
Browse files

ANDROID: f2fs: fix wrong merge solution 



It seems that we have incorrect conflict resolutions in 'fs/f2fs/file.c'
when merging stable 5.15.161.

Bug: 390041624
Fixes: 393dc6f3 ("Merge a89f73ed ("scripts/gdb: fix SB_* constants parsing") into android14-5.15-lts")
Change-Id: I9b125e5db171e8ca293e552d4aaecc1a54eb70fa
Signed-off-by: default avataryenchia.chen <yenchia.chen@mediatek.com>
Bug: 391529096
parent 323c5895
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