f2fs-for-3.5: fix conflict with new base and patch reverting freeze/unfreeze ops

Signed-off-by: Alejandro Martinez Ruiz <alex@nowcomputing.com>