This is a note to let you know that I've just added the patch titled MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G 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-bcm47xx-fix-detecting-microsoft-mn-700-asus-wl500g.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 <stable@xxxxxxxxxxxxxxx> know about it. >From ralf@xxxxxxxxxxxxxx Fri May 8 16:41:25 2015 From: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Date: Wed, 1 Apr 2015 16:01:02 +0200 Subject: MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G To: stable@xxxxxxxxxxxxxxx Message-ID: <120826c332638c82e91d69cb98a0d305fd768b33.1431087908.git.ralf@xxxxxxxxxxxxxx> From: Rafał Miłecki <zajec5@xxxxxxxxx> Commit 96f7c21363e0e0d19f3471f54a719ed06d708513 upstream. Since the day of adding this code it was broken. We were iterating over a wrong array and checking for wrong NVRAM entry. Signed-off-by: Rafał Miłecki <zajec5@xxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Cc: Hauke Mehrtens <hauke@xxxxxxxxxx> Patchwork: https://patchwork.linux-mips.org/patch/9654/ Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/mips/bcm47xx/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c @@ -247,8 +247,8 @@ static __init const struct bcm47xx_board } if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 && - bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) { - for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) { + bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) { + for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) { if (!strstarts(buf1, e2->value1) && !strcmp(buf2, e2->value2)) return &e2->board; Patches currently in stable-queue which might be from ralf@xxxxxxxxxxxxxx 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html