upgrade 3.13 targets to 3.13.7

Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 40022
2014-03-26 11:34:39 +00:00 · 2014-03-26 11:34:39 +00:00 · b8e295aa7b
commit b8e295aa7b
parent 608f4fe3b0
15 changed files with 23 additions and 23 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -23,8 +23,8 @@ endif
 ifeq ($(LINUX_VERSION),3.12.10)
  LINUX_KERNEL_MD5SUM:=93325074b7b1d7bb76fb7d4348f0aa7a
 endif
-ifeq ($(LINUX_VERSION),3.13.2)
-  LINUX_KERNEL_MD5SUM:=83386986b4b58507a4f064aa46676f5e
+ifeq ($(LINUX_VERSION),3.13.7)
+  LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
 endif

 # disable the md5sum check for unknown kernel versions
--- a/target/linux/generic/patches-3.13/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.13/100-overlayfs.patch
@ -3148,7 +3148,7 @@
 +module_exit(ovl_exit);
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1309,6 +1309,7 @@ long do_splice_direct(struct file *in, l
+@@ -1327,6 +1327,7 @@ long do_splice_direct(struct file *in, l
 
 	return ret;
 }
--- a/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch
@ -31,7 +31,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
 --- a/drivers/usb/host/ehci-hub.c
 +++ b/drivers/usb/host/ehci-hub.c
-@@ -623,7 +623,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc
 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
 	 * PORT_POWER; that's surprising, but maybe within-spec.
 	 */
@ -40,7 +40,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
 	else
 		mask = PORT_CSC | PORT_PEC;
-@@ -983,7 +983,7 @@ static int ehci_hub_control (
+@@ -1001,7 +1001,7 @@ static int ehci_hub_control (
 		if (temp & PORT_PEC)
 			status |= USB_PORT_STAT_C_ENABLE << 16;
 
--- a/target/linux/generic/patches-3.13/221-module_exports.patch
+++ b/target/linux/generic/patches-3.13/221-module_exports.patch
@ -84,5 +84,5 @@
 +	__attribute__((section("__ksymtab_strings"		\
 +	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
 	= VMLINUX_SYMBOL_STR(sym);				\
+ 	extern const struct kernel_symbol __ksymtab_##sym;	\
 	__visible const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--- a/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
+++ b/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@ -30,7 +30,7 @@
 /****************************************************************************/
 
 struct m25p {
-@@ -1035,7 +1041,7 @@ static int m25p_probe(struct spi_device
+@@ -1032,7 +1038,7 @@ static int m25p_probe(struct spi_device
 		flash->mtd._write = m25p80_write;
 
 	/* prefer "small sector" erase if possible */
--- a/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
+++ b/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -866,6 +866,7 @@ static const struct spi_device_id m25p_i
+@@ -863,6 +863,7 @@ static const struct spi_device_id m25p_i
 	{ "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
 
 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
--- a/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch
@ -1081,7 +1081,7 @@
 ifdef CONFIG_FUNCTION_TRACER
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
-@@ -79,6 +89,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
+@@ -80,6 +90,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
 obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
 obj-$(CONFIG_XZ_DEC) += xz/
 obj-$(CONFIG_RAID6_PQ) += raid6/
--- a/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch
@ -49,7 +49,7 @@
 
 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
 		      unsigned char banned_flags)
-@@ -5152,6 +5151,9 @@ int __init addrconf_init(void)
+@@ -5154,6 +5153,9 @@ int __init addrconf_init(void)
 
 	ipv6_addr_label_rtnl_register();
 
@ -59,7 +59,7 @@
 	return 0;
 errout:
 	rtnl_af_unregister(&inet6_ops);
-@@ -5170,6 +5172,9 @@ void addrconf_cleanup(void)
+@@ -5172,6 +5174,9 @@ void addrconf_cleanup(void)
 	struct net_device *dev;
 	int i;
 
--- a/target/linux/generic/patches-3.13/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.13/721-phy_packets.patch
@ -79,7 +79,7 @@
 	help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2604,10 +2604,20 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2606,10 +2606,20 @@ int dev_hard_start_xmit(struct sk_buff *
 		if (!list_empty(&ptype_all))
 			dev_queue_xmit_nit(skb, dev);
 
@ -105,7 +105,7 @@
 		return rc;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -60,6 +60,7 @@
+@@ -62,6 +62,7 @@
 #include <linux/scatterlist.h>
 #include <linux/errqueue.h>
 #include <linux/prefetch.h>
@ -113,7 +113,7 @@
 
 #include <net/protocol.h>
 #include <net/dst.h>
-@@ -466,6 +467,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -438,6 +439,22 @@ struct sk_buff *__netdev_alloc_skb(struc
 }
 EXPORT_SYMBOL(__netdev_alloc_skb);
 
--- a/target/linux/generic/patches-3.13/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.13/902-debloat_proc.patch
@ -173,7 +173,7 @@
 		goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2958,6 +2958,8 @@ static __net_initdata struct pernet_oper
+@@ -2960,6 +2960,8 @@ static __net_initdata struct pernet_oper
 
 static int __init proto_init(void)
 {
--- a/target/linux/generic/patches-3.13/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.13/950-vm_exports.patch
@ -52,7 +52,7 @@
  * When we die, we re-parent all our children, and try to:
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -2874,6 +2874,7 @@ int can_nice(const struct task_struct *p
+@@ -2896,6 +2896,7 @@ int can_nice(const struct task_struct *p
 	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
 		capable(CAP_SYS_NICE));
 }
--- a/target/linux/mxs/Makefile
+++ b/target/linux/mxs/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
 CPU_TYPE:=arm926ej-s

 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-LINUX_VERSION:=3.13.2
+LINUX_VERSION:=3.13.7
 KERNELNAME:="zImage dtbs"

 define Target/Description
--- a/target/linux/omap/Makefile
+++ b/target/linux/omap/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2013 OpenWrt.org
+# Copyright (C) 2012-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -13,7 +13,7 @@ FEATURES:=usb usbgadget ext4 targz fpu audio display ubifs
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfpv3

-LINUX_VERSION:=3.13.2
+LINUX_VERSION:=3.13.7

 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

--- a/target/linux/sunxi/Makefile
+++ b/target/linux/sunxi/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -15,7 +15,7 @@ CPU_TYPE:=cortex-a8
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>

-LINUX_VERSION:=3.13.2
+LINUX_VERSION:=3.13.7
 KERNELNAME:="zImage dtbs"
 DEFAULT_PACKAGES += uboot-envtools uboot-sunxi kmod-eeprom-sunxi kmod-wdt-sunxi

--- a/target/linux/x86_64/Makefile
+++ b/target/linux/x86_64/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=x86_64
 FEATURES:=ext4 vdi vmdk targz
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

-LINUX_VERSION:=3.13.2
+LINUX_VERSION:=3.13.7

 KERNELNAME:=bzImage