From 0e6867db1e9a2feb6ded27a33631e25f6c18e11e Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 12 Apr 2014 11:59:07 +0000 Subject: [PATCH] kernel: update 3.10 to 3.10.36 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40467 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/bcm53xx/Makefile | 2 +- ...02-bgmac-make-bgmac-work-on-systems-without-nvram.patch | 6 +++--- target/linux/brcm2708/Makefile | 2 +- target/linux/brcm47xx/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- target/linux/cns21xx/Makefile | 2 +- target/linux/imx6/Makefile | 2 +- target/linux/ixp4xx/Makefile | 2 +- target/linux/kirkwood/Makefile | 2 +- target/linux/lantiq/Makefile | 2 +- target/linux/lantiq/patches-3.10/0103-tffs.patch | 12 ++++-------- target/linux/lantiq/patches-3.10/0104-nand.patch | 8 +++----- .../0105-mips-lantiq-flash-add-jedec-probe.patch | 4 ++-- target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch | 14 ++++++-------- .../linux/lantiq/patches-3.10/0205-lantiq-nand-lock.patch | 4 ++-- .../linux/lantiq/patches-3.10/0206-lantiq-nand-lock.patch | 4 ++-- target/linux/malta/Makefile | 2 +- target/linux/mpc85xx/Makefile | 2 +- target/linux/mvebu/Makefile | 2 +- target/linux/octeon/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/ppc44x/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- .../0131-mtd-add-chunked-read-io-to-m25p80.patch | 12 +++++------- target/linux/rb532/Makefile | 2 +- target/linux/realview/Makefile | 2 +- target/linux/sparc/Makefile | 2 +- target/linux/x86/Makefile | 2 +- target/linux/xburst/Makefile | 2 +- 34 files changed, 54 insertions(+), 64 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 69b0c91230..44a7f11bdc 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -17,8 +17,8 @@ endif ifeq ($(LINUX_VERSION),3.9.11) LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 endif -ifeq ($(LINUX_VERSION),3.10.34) - LINUX_KERNEL_MD5SUM:=30991b495a3d75196d5608072d2e62e6 +ifeq ($(LINUX_VERSION),3.10.36) + LINUX_KERNEL_MD5SUM:=721f76050755ec8ec88876ee350a2726 endif ifeq ($(LINUX_VERSION),3.12.10) LINUX_KERNEL_MD5SUM:=93325074b7b1d7bb76fb7d4348f0aa7a diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index c49356d873..dd9908db46 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm MAINTAINER:=Florian Fainelli SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 25c51c33ef..e26b176ea7 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 36a2f46887..ce07dc1141 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 2215d23941..290f9b3d14 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index edcf137561..339e7cddb8 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio MAINTAINER:=Hauke Mehrtens CPU_TYPE:=cortex-a9 -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch index 78154707e7..c23e205218 100644 --- a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch +++ b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch @@ -31,7 +31,7 @@ The PHY says it is not connected by default, just ignore it. static const struct bcma_device_id bgmac_bcma_tbl[] = { BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS), -@@ -1438,7 +1442,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1452,7 +1456,7 @@ static int bgmac_probe(struct bcma_devic int err; /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ @@ -40,7 +40,7 @@ The PHY says it is not connected by default, just ignore it. pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1473,8 +1477,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1487,8 +1491,7 @@ static int bgmac_probe(struct bcma_devic } bgmac->cmn = core->bus->drv_gmac_cmn.core; @@ -50,7 +50,7 @@ The PHY says it is not connected by default, just ignore it. bgmac->phyaddr &= BGMAC_PHY_MASK; if (bgmac->phyaddr == BGMAC_PHY_MASK) { bgmac_err(bgmac, "No PHY found\n"); -@@ -1526,8 +1529,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1540,8 +1543,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 038c19508c..c0bf2d9d4d 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli CPU_TYPE:=arm1176jzf-s CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index ebc77c6ca7..78151f7bd7 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM47xx/53xx (MIPS) FEATURES:=squashfs usb pcmcia MAINTAINER:=Hauke Mehrtens -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += swconfig wpad-mini nvram \ diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 12a775e40a..8ab0d7b5fc 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 24981e0158..1cbf781e54 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs CPU_TYPE:=fa526 -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index b5a7ebe3e2..4d46c3ea79 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index c3cb734e45..e52076f87e 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic harddisk -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index d30d78b636..a14cf77eb3 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand ubifs CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 6653cc407f..65839eb274 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq FEATURES:=squashfs ubifs SUBTARGETS=xway xrx200 -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 CPU_TYPE:=mips32r2 diff --git a/target/linux/lantiq/patches-3.10/0103-tffs.patch b/target/linux/lantiq/patches-3.10/0103-tffs.patch index 04c2887ab7..3b0686d898 100644 --- a/target/linux/lantiq/patches-3.10/0103-tffs.patch +++ b/target/linux/lantiq/patches-3.10/0103-tffs.patch @@ -4,10 +4,8 @@ Date: Sun, 14 Jul 2013 22:26:43 +0200 Subject: add basic tffs driver --- -Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.10.13.orig/arch/mips/lantiq/xway/Makefile 2013-09-29 00:18:30.164765435 +0200 -+++ linux-3.10.13/arch/mips/lantiq/xway/Makefile 2013-09-29 00:18:30.216765439 +0200 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,6 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o @@ -16,10 +14,8 @@ Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o -Index: linux-3.10.13/arch/mips/lantiq/xway/tffs.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/arch/mips/lantiq/xway/tffs.c 2013-09-29 00:37:17.712792305 +0200 +--- /dev/null ++++ b/arch/mips/lantiq/xway/tffs.c @@ -0,0 +1,87 @@ +#include +#include diff --git a/target/linux/lantiq/patches-3.10/0104-nand.patch b/target/linux/lantiq/patches-3.10/0104-nand.patch index 2712e761f0..f4b5793284 100644 --- a/target/linux/lantiq/patches-3.10/0104-nand.patch +++ b/target/linux/lantiq/patches-3.10/0104-nand.patch @@ -1,8 +1,6 @@ -Index: linux-3.10.34/drivers/mtd/nand/xway_nand.c -=================================================================== ---- linux-3.10.34.orig/drivers/mtd/nand/xway_nand.c 2014-03-28 11:51:49.790953906 +0000 -+++ linux-3.10.34/drivers/mtd/nand/xway_nand.c 2014-03-28 15:45:08.196369790 +0000 -@@ -80,13 +80,16 @@ +--- a/drivers/mtd/nand/xway_nand.c ++++ b/drivers/mtd/nand/xway_nand.c +@@ -80,13 +80,16 @@ static void xway_reset_chip(struct nand_ static void xway_select_chip(struct mtd_info *mtd, int chip) { diff --git a/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch b/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch index 327a45ccd8..6ddb78bd53 100644 --- a/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch +++ b/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch @@ -9,8 +9,8 @@ Signed-off-by: Ben Mulvihill lantiq-flash.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---- a/drivers/mtd/maps/lantiq-flash.c 2014-03-23 09:18:25.099370216 +0100 -+++ b/drivers/mtd/maps/lantiq-flash.c 2014-03-19 17:19:45.732111306 +0100 +--- a/drivers/mtd/maps/lantiq-flash.c ++++ b/drivers/mtd/maps/lantiq-flash.c @@ -117,6 +117,11 @@ ltq_mtd_probe(struct platform_device *pd struct cfi_private *cfi; int err; diff --git a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch index cf95b8d46f..8ec9ff45cf 100644 --- a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch +++ b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch @@ -1,8 +1,6 @@ -Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c -=================================================================== ---- linux-3.10.34.orig/arch/mips/lantiq/xway/ath_eep.c 2014-04-03 13:25:03.128464891 +0100 -+++ linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c 2014-04-03 13:35:30.432482868 +0100 -@@ -36,10 +36,11 @@ +--- a/arch/mips/lantiq/xway/ath_eep.c ++++ b/arch/mips/lantiq/xway/ath_eep.c +@@ -36,10 +36,11 @@ static int ath9k_pci_plat_dev_init(struc return 0; } @@ -15,7 +13,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c u32 mac_inc = 0, pci_slot = 0; int i; struct mtd_info *the_mtd; -@@ -112,6 +113,18 @@ +@@ -112,6 +113,18 @@ int __init of_ath9k_eeprom_probe(struct if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) { ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data); dev_info(&pdev->dev, "pci slot: %u\n", pci_slot); @@ -34,7 +32,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c } dev_info(&pdev->dev, "loaded ath9k eeprom\n"); -@@ -132,20 +145,19 @@ +@@ -132,20 +145,19 @@ static struct platform_driver ath9k_eepr }, }; @@ -58,7 +56,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c return 0; return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe); } -@@ -247,4 +259,4 @@ +@@ -247,4 +259,4 @@ static int __init of_ath5k_eeprom_init(v { return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); } diff --git a/target/linux/lantiq/patches-3.10/0205-lantiq-nand-lock.patch b/target/linux/lantiq/patches-3.10/0205-lantiq-nand-lock.patch index f82774d889..08d81fd292 100644 --- a/target/linux/lantiq/patches-3.10/0205-lantiq-nand-lock.patch +++ b/target/linux/lantiq/patches-3.10/0205-lantiq-nand-lock.patch @@ -22,8 +22,8 @@ Signed-off-by: Ben Mulvihill --- ---- a/drivers/mtd/nand/xway_nand.c 2014-04-01 20:14:53.072824371 +0200 -+++ b/drivers/mtd/nand/xway_nand.c 2014-04-01 21:24:52.798612391 +0200 +--- a/drivers/mtd/nand/xway_nand.c ++++ b/drivers/mtd/nand/xway_nand.c @@ -102,7 +102,6 @@ static void xway_cmd_ctrl(struct mtd_inf { struct nand_chip *this = mtd->priv; diff --git a/target/linux/lantiq/patches-3.10/0206-lantiq-nand-lock.patch b/target/linux/lantiq/patches-3.10/0206-lantiq-nand-lock.patch index 6e332b4bf9..34d7235ec6 100644 --- a/target/linux/lantiq/patches-3.10/0206-lantiq-nand-lock.patch +++ b/target/linux/lantiq/patches-3.10/0206-lantiq-nand-lock.patch @@ -20,8 +20,8 @@ Signed-off-by: Ben Mulvihill --- ---- a/drivers/mtd/nand/xway_nand.c 2014-04-01 21:24:52.798612391 +0200 -+++ a/drivers/mtd/nand/xway_nand.c 2014-04-01 21:20:33.924585096 +0200 +--- a/drivers/mtd/nand/xway_nand.c ++++ b/drivers/mtd/nand/xway_nand.c @@ -54,8 +54,27 @@ #define NAND_CON_CSMUX (1 << 1) #define NAND_CON_NANDM 1 diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 21f8345d01..b29568fdfe 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64 INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 DEVICE_TYPE:=developerboard diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 5755ff7fc1..957c13f5ac 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index a1ade2fcc1..30036d3844 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index ee54bfb3f8..8e9ca60167 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=octeon CPU_CFLAGS_octeon:=-march=octeon MAINTAINER:=John Crispin -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 4e75198945..a13ff7b2cb 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CPU_TYPE:=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 30a85cff42..5f29716ee4 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs broken CPU_TYPE:=440 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 72e2524c97..44565c6467 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch index 6123ec1105..751a9bcd0c 100644 --- a/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch +++ b/target/linux/ramips/patches-3.10/0131-mtd-add-chunked-read-io-to-m25p80.patch @@ -8,11 +8,9 @@ Signed-off-by: John Crispin drivers/mtd/devices/m25p80.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) -Index: linux-3.10.34/drivers/mtd/devices/m25p80.c -=================================================================== ---- linux-3.10.34.orig/drivers/mtd/devices/m25p80.c 2014-03-30 19:40:10.135292951 +0100 -+++ linux-3.10.34/drivers/mtd/devices/m25p80.c 2014-03-30 19:44:40.151295482 +0100 -@@ -392,6 +392,58 @@ +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -392,6 +392,58 @@ static int m25p80_read(struct mtd_info * return 0; } @@ -71,7 +69,7 @@ Index: linux-3.10.34/drivers/mtd/devices/m25p80.c /* * Write an address range to the flash chip. Data must be written in * FLASH_PAGESIZE chunks. The address range may be any size provided -@@ -479,6 +531,76 @@ +@@ -479,6 +531,76 @@ static int m25p80_write(struct mtd_info return 0; } @@ -148,7 +146,7 @@ Index: linux-3.10.34/drivers/mtd/devices/m25p80.c static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1058,6 +1180,12 @@ +@@ -1058,6 +1180,12 @@ static int m25p_probe(struct spi_device flash->fast_read = true; #endif diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 8276da5a51..915abba5e0 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=pci targz broken -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index 8d98187d7c..5299c17369 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=mpcore CPU_SUBTYPE:=vfp MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 DEVICE_TYPE:=developerboard diff --git a/target/linux/sparc/Makefile b/target/linux/sparc/Makefile index a031f2678d..a0ccaa92a3 100644 --- a/target/linux/sparc/Makefile +++ b/target/linux/sparc/Makefile @@ -11,7 +11,7 @@ BOARD:=sparc BOARDNAME:=Sun UltraSPARC FEATURES+=fpu tgz ext4 squashfs broken -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 MAINTAINER:=Imre Kaloz include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index b589cd5b59..2fdd746b15 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ rdc -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 KERNELNAME:=bzImage diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 8157f452fd..12ae8736cf 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=targz ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=3.10.34 +LINUX_VERSION:=3.10.36 DEVICE_TYPE=other -- 2.11.0