commit 024f76bca9d0e29513fa99e1cd0f86bfa841743b Author: Greg Kroah-Hartman Date: Sun Aug 27 21:01:32 2023 +0200 Linux 6.1.49 Link: https://lore.kernel.org/r/20230826154625.450325166@linuxfoundation.org Tested-by: Joel Fernandes (Google) Tested-by: Takeshi Ogasawara Tested-by: Sudip Mukherjee Tested-by: Bagas Sanjaya Tested-by: Guenter Roeck Tested-by: Salvatore Bonaccorso Signed-off-by: Greg Kroah-Hartman commit db05f8449bb3529aa65753d30ed2df7720d4f36a Author: Greg Kroah-Hartman Date: Sat Aug 26 17:29:00 2023 +0200 Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()" This reverts commit a78a8bcdc26de5ef3a0ee27c9c6c512e54a6051c which is commit a6ec83786ab9f13f25fb18166dee908845713a95 upstream. Something is currently broken in the f2fs code, Guenter has reported boot problems with it for a few releases now, so revert the most recent f2fs changes in the hope to get this back to a working filesystem. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net Cc: Chao Yu Cc: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman commit c5bd20577ff33c8ce2df9079df1c70e943652d56 Author: Greg Kroah-Hartman Date: Sat Aug 26 17:28:54 2023 +0200 Revert "f2fs: fix to set flush_merge opt and show noflush_merge" This reverts commit 6ba0594a81f91d6fd8ca9bd4ad23aa1618635a0f which is commit 967eaad1fed5f6335ea97a47d45214744dc57925 upstream. Something is currently broken in the f2fs code, Guenter has reported boot problems with it for a few releases now, so revert the most recent f2fs changes in the hope to get this back to a working filesystem. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net Cc: Chao Yu Cc: Jaegeuk Kim Cc: Yangtao Li Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman commit 76e18e6709c84af8cdc95e5c09437e29ec337d1c Author: Greg Kroah-Hartman Date: Sat Aug 26 17:28:48 2023 +0200 Revert "f2fs: don't reset unchangable mount option in f2fs_remount()" This reverts commit e2fb24ce37caeaecff08af4e9967c8462624312b which is commit 458c15dfbce62c35fefd9ca637b20a051309c9f1 upstream. Something is currently broken in the f2fs code, Guenter has reported boot problems with it for a few releases now, so revert the most recent f2fs changes in the hope to get this back to a working filesystem. Reported-by: Guenter Roeck Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net Cc: Chao Yu Cc: Jaegeuk Kim Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman commit 77c576602dc7406781e0e9934bfe8dc9506d1bf4 Author: Peter Zijlstra Date: Mon Aug 14 13:44:29 2023 +0200 objtool/x86: Fix SRSO mess commit 4ae68b26c3ab5a82aa271e6e9fc9b1a06e1d6b40 upstream. Objtool --rethunk does two things: - it collects all (tail) call's of __x86_return_thunk and places them into .return_sites. These are typically compiler generated, but RET also emits this same. - it fudges the validation of the __x86_return_thunk symbol; because this symbol is inside another instruction, it can't actually find the instruction pointed to by the symbol offset and gets upset. Because these two things pertained to the same symbol, there was no pressing need to separate these two separate things. However, alas, along comes SRSO and more crazy things to deal with appeared. The SRSO patch itself added the following symbol names to identify as rethunk: 'srso_untrain_ret', 'srso_safe_ret' and '__ret' Where '__ret' is the old retbleed return thunk, 'srso_safe_ret' is a new similarly embedded return thunk, and 'srso_untrain_ret' is completely unrelated to anything the above does (and was only included because of that INT3 vs UD2 issue fixed previous). Clear things up by adding a second category for the embedded instruction thing. Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230814121148.704502245@infradead.org Signed-off-by: Josh Poimboeuf Signed-off-by: Greg Kroah-Hartman