Files
Greg Kroah-Hartman 88d80558f8 Merge ad34d9c738 ("ext4: fix FS_IOC_GETFSMAP handling") into android16-6.12
Steps on the way to 6.12.2

Resolves merge conflicts in:
	fs/f2fs/data.c
	include/linux/f2fs_fs.h

Change-Id: I4903837fe6be213c3eb5a9091f24e2838efc660b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2024-12-13 06:24:42 -08:00
..