From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55392 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753193AbbEHOns (ORCPT ); Fri, 8 May 2015 10:43:48 -0400 Subject: Patch "MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter" has been added to the 4.0-stable tree To: ralf@linux-mips.org, gregkh@linuxfoundation.org, markos.chandras@imgtec.com Cc: , From: Date: Fri, 08 May 2015 16:43:20 +0200 In-Reply-To: Message-ID: <143109620055185@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter to the 4.0-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-kconfig-fix-typo-for-the-r2-to-r6-emulator-kernel-parameter.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ralf@linux-mips.org Fri May 8 16:39:19 2015 From: Ralf Baechle Date: Tue, 10 Mar 2015 12:30:56 +0000 Subject: MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter To: stable@vger.kernel.org Message-ID: From: Markos Chandras Commit 07edf0d46c07568d08feee95bbaa38c71b084150 upstream. Commit b0a668fb2038 ("MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for MIPS R6") added the mips r2-to-r6 emulator so an R2 userland can be executed on R6 kernels. This needed both build time and runtime support. The runtime support needed the "mipsr2emu" kernel parameter instead of the "mipsr2emul" listed in the Kconfig help message. Signed-off-by: Markos Chandras Fixes: b0a668fb2038 ("MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for MIPS R6") Cc: linux-mips@linux-mips.org Cc: Markos Chandras Patchwork: https://patchwork.linux-mips.org/patch/9504/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2072,7 +2072,7 @@ config MIPSR2_TO_R6_EMULATOR help Choose this option if you want to run non-R6 MIPS userland code. Even if you say 'Y' here, the emulator will still be disabled by - default. You can enable it using the 'mipsr2emul' kernel option. + default. You can enable it using the 'mipsr2emu' kernel option. The only reason this is a build-time option is to save ~14K from the final kernel image. comment "MIPS R2-to-R6 emulator is only available for UP kernels" Patches currently in stable-queue which might be from ralf@linux-mips.org are queue-4.0/mips-octeon-remove-udelay-causing-huge-irq-latency.patch queue-4.0/mips-makefile-fix-mips-ase-detection-code.patch queue-4.0/mips-r4kcache-use-correct-base-register-for-mips-r6-cache-flushes.patch queue-4.0/mips-fix-cpu_has_mips_r2_exec_hazard.patch queue-4.0/mips-ralink-fix-bad-config-symbol-in-pci-makefile.patch queue-4.0/revert-mips-remove-race-window-in-page-fault-handling.patch queue-4.0/mips-fix-race-condition-in-lazy-cache-flushing.patch queue-4.0/mips-bcm63xx-move-bcm63xx_gpio_init-to-bcm63xx_register_devices.patch queue-4.0/mips-octeon-delete-override-of-cpu_has_mips_r2_exec_hazard.patch queue-4.0/mips-asm-spinlock-fix-addiu-instruction-for-r10000_llsc_war-case.patch queue-4.0/mips-kconfig-disable-smp-cps-for-64-bit.patch queue-4.0/mips-bcm47xx-fix-detecting-microsoft-mn-700-asus-wl500g.patch queue-4.0/mips-octeon-use-correct-csr-to-soft-reset.patch queue-4.0/revert-mips-avoid-pipeline-stalls-on-some-mips32r2-cores.patch queue-4.0/mips-octeon-dma-octeon-fix-ohci-usb-config-check.patch queue-4.0/mips-octeon-fix-pci-interrupt-mapping-for-d-link-dsr-1000n.patch queue-4.0/mips-kconfig-fix-typo-for-the-r2-to-r6-emulator-kernel-parameter.patch queue-4.0/ssb-fix-kconfig-dependencies.patch queue-4.0/mips-kernel-entry.s-set-correct-isa-level-for-mips_ihb.patch queue-4.0/mips-netlogic-fix-for-sata-phy-init.patch queue-4.0/mips-ralink-add-missing-symbol-for-ralink_ill_acc.patch queue-4.0/mips-asm-elf-set-o32-default-fpu-flags.patch queue-4.0/mips-smp-cps-cpu_set-fpu-mask-if-fpu-present.patch