mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-09 21:42:09 +02:00
082f20b21d
Resolve the conflict between these commits: x86/fpu:1193f408cd("x86/fpu/signal: Change return type of __fpu_restore_sig() to boolean") x86/urgent:d298b03506("x86/fpu: Restore the masking out of reserved MXCSR bits")b2381acd3f("x86/fpu: Mask out the invalid MXCSR bits properly") Conflicts: arch/x86/kernel/fpu/signal.c Signed-off-by: Ingo Molnar <mingo@kernel.org>