Merge 6.1.49 into android14-6.1-lts

Changes in 6.1.49
	objtool/x86: Fix SRSO mess
	Revert "f2fs: don't reset unchangable mount option in f2fs_remount()"
	Revert "f2fs: fix to set flush_merge opt and show noflush_merge"
	Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()"
	Linux 6.1.49

Change-Id: I612c9fa3a7a3c5b8c47eac6404873b5955217716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>