Commit 6c6b68a1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 1d153193 ("f2fs: introduce f2fs_base_attr for global sysfs entries")... 


Merge 1d153193 ("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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2b9efc37 1d153193
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