This is a note to let you know that I've just added the patch titled MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-fix-a-typo-s-preset-present-in-r2-to-r6-emulation-error-message.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 27fe2200dad2de8207a694024a7b9037dff1b280 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" <macro@xxxxxxxxxx> Date: Fri, 16 Jun 2017 00:15:22 +0100 Subject: MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message From: Maciej W. Rozycki <macro@xxxxxxxxxx> commit 27fe2200dad2de8207a694024a7b9037dff1b280 upstream. This is a user-visible message, so we want it to be spelled correctly. Fixes: 5f9f41c474be ("MIPS: kernel: Prepare the JR instruction for emulation on MIPS R6") Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxx> Cc: James Hogan <james.hogan@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Patchwork: https://patchwork.linux-mips.org/patch/16400/ Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/mips/kernel/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -823,7 +823,7 @@ sigill_dsp: force_sig(SIGILL, current); return -EFAULT; sigill_r2r6: - pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n", + pr_info("%s: R2 branch but r2-to-r6 emulator is not present - sending SIGILL.\n", current->comm); force_sig(SIGILL, current); return -EFAULT; Patches currently in stable-queue which might be from macro@xxxxxxxxxx are queue-4.9/mips-send-sigill-for-bposge32-in-__compute_return_epc_for_insn.patch queue-4.9/mips-actually-decode-jalx-in-__compute_return_epc_for_insn.patch queue-4.9/mips-fix-a-typo-s-preset-present-in-r2-to-r6-emulation-error-message.patch queue-4.9/mips-fix-unaligned-pc-interpretation-in-compute_return_epc.patch queue-4.9/mips-rename-sigill_r6-to-sigill_r2r6-in-__compute_return_epc_for_insn.patch queue-4.9/mips-send-sigill-for-r6-branches-in-__compute_return_epc_for_insn.patch queue-4.9/mips-send-sigill-for-linked-branches-in-__compute_return_epc_for_insn.patch queue-4.9/mips-math-emu-prevent-wrong-isa-mode-instruction-emulation.patch