Merge 1d15319323 ("f2fs: introduce f2fs_base_attr for global sysfs entries") into android16-6.12-lts
Steps on the way to 6.12.31 Resolves merge conflicts in: fs/f2fs/sysfs.c Change-Id: Ic76e25b1da7fae3f30eb570cc0c4dc48e6985560 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in: