diff options
28 files changed, 28 insertions, 43 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 52bb309ecf..d63ab650a0 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.12) - LINUX_KERNEL_MD5SUM:=16e43b3c9957cf5af44863d6809efe38 +ifeq ($(LINUX_VERSION),3.10.13) + LINUX_KERNEL_MD5SUM:=64ffe74249442fd7452d12348955ccfd endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index e80cc5961b..cabcf04641 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.10/200-MIPS-ath79-fix-ar933x-watchdog-clock.patch b/target/linux/ar71xx/patches-3.10/200-MIPS-ath79-fix-ar933x-watchdog-clock.patch deleted file mode 100644 index b3a3cd39f4..0000000000 --- a/target/linux/ar71xx/patches-3.10/200-MIPS-ath79-fix-ar933x-watchdog-clock.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Subject: [PATCH] MIPS: ath79: fix ar933x watchdog clock - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- a/arch/mips/ath79/clock.c -+++ b/arch/mips/ath79/clock.c -@@ -164,7 +164,7 @@ static void __init ar933x_clocks_init(vo - ath79_ahb_clk.rate = freq / t; - } - -- ath79_wdt_clk.rate = ath79_ref_clk.rate; -+ ath79_wdt_clk.rate = ath79_ahb_clk.rate; - ath79_uart_clk.rate = ath79_ref_clk.rate; - } - diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index abcff6d385..a7387e3fd0 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index 60701e502b..c39c0205e5 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -14,7 +14,7 @@ MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 17606f42b4..0bd3f2fb43 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org> CPU_TYPE:=arm1176jzf-s CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 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 535e7033ca..3ad04fe9a5 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 1fcbc8174f..f4aa477b31 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 -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 30066abdb1..8568323c90 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.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.10/941-ocf_20120127.patch b/target/linux/generic/patches-3.10/941-ocf_20120127.patch index a177fdedda..dc16d01ffc 100644 --- a/target/linux/generic/patches-3.10/941-ocf_20120127.patch +++ b/target/linux/generic/patches-3.10/941-ocf_20120127.patch @@ -156,7 +156,7 @@ void generate_random_uuid(unsigned char uuid_out[16]); --- a/kernel/pid.c +++ b/kernel/pid.c -@@ -422,6 +422,7 @@ void transfer_pid(struct task_struct *ol +@@ -423,6 +423,7 @@ void transfer_pid(struct task_struct *ol new->pids[type].pid = old->pids[type].pid; hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node); } diff --git a/target/linux/imx23/Makefile b/target/linux/imx23/Makefile index 439b01fc1a..fd4ffb24b9 100644 --- a/target/linux/imx23/Makefile +++ b/target/linux/imx23/Makefile @@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio CPU_TYPE:=arm926ej-s MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 KERNELNAME:="zImage dtbs" define Target/Description diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index eed8088460..621473128f 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 7bc839ac49..86acd347a8 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic harddisk -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index fa98788318..9ac2a13b3e 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP FEATURES:=squashfs SUBTARGETS=xway xrx200 ase falcon -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 CPU_TYPE:=mips32r2 diff --git a/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch index ce1412aa86..9329e15315 100644 --- a/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch @@ -5527,7 +5527,7 @@ Subject: [PATCH 01/34] MIPS: lantiq: add pcie driver unsigned long type); --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -1042,6 +1042,12 @@ +@@ -1044,6 +1044,12 @@ #define PCI_DEVICE_ID_SGI_LITHIUM 0x1002 #define PCI_DEVICE_ID_SGI_IOC4 0x100a diff --git a/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch index 559a6b8c3d..22526cfb7c 100644 --- a/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch +++ b/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch @@ -20,7 +20,7 @@ Subject: [PATCH 32/34] USB: fix roothub for IFXHCD choice --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4041,7 +4041,7 @@ hub_port_init (struct usb_hub *hub, stru +@@ -4036,7 +4036,7 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index c05a30246f..853013a41e 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 <florian@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 DEVICE_TYPE:=developerboard diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 278cdee345..bbb9c01a6a 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index bf3c5f86a9..611cafbb51 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 <luka@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index a9fd5abfde..a861ca23b4 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 <blogic@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 947c8ebb22..cac70d8959 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CPU_TYPE:=405 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 6c48c01944..78e840e765 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs broken CPU_TYPE:=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 9a13a2c9a1..fec7ddbc93 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x rt3883 mt7620a rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 1a30bef8f0..c37123ad47 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.12 +LINUX_VERSION:=3.10.13 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 7088bc33e7..ee5dfc51b8 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=mpcore CPU_SUBTYPE:=vfp MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 DEVICE_TYPE:=developerboard diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk index fce9c90972..2d789a1fde 100644 --- a/target/linux/x86/alix2/target.mk +++ b/target/linux/x86/alix2/target.mk @@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ kmod-ledtrig-netdev \ kmod-cpu-msr hwclock wpad -LINUX_VERSION:=3.10.12 +LINUX_VERSION:=3.10.13 CS5535_MASK:=0x0b000042 CPU_TYPE := geode diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index b799b7c70b..0de518b45b 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.12 +LINUX_VERSION:=3.10.13 DEVICE_TYPE=other diff --git a/target/linux/xburst/patches-3.10/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch b/target/linux/xburst/patches-3.10/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch index 1754de71b6..4d2c88e29d 100644 --- a/target/linux/xburst/patches-3.10/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch +++ b/target/linux/xburst/patches-3.10/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch @@ -106,7 +106,7 @@ Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> else ret = chip->ecc.read_page(mtd, chip, bufpoi, oob_required, page); -@@ -3475,8 +3544,13 @@ int nand_scan_tail(struct mtd_info *mtd) +@@ -3477,8 +3546,13 @@ int nand_scan_tail(struct mtd_info *mtd) "hardware ECC not possible\n"); BUG(); } |