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>

security/apparmor/capability.c

@@ -96,6 +96,8 @@ static int audit_caps(struct apparmor_audit_data *ad, struct aa_profile *profile
 		return error;
 	} else {
 		aa_put_profile(ent->profile);
+		if (profile != ent->profile)
+			cap_clear(ent->caps);
 		ent->profile = aa_get_profile(profile);
 		cap_raise(ent->caps, cap);
 	}