kernel: update 3.10 to 3.10.21

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38972

32 files changed, 110 insertions, 166 deletions

diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index ab0e694..6707291 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs atm
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 SUBTARGETS:=generic ac49x
 
-LINUX_VERSION:=3.10.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 2491bc6..5fddd6f 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index c8be8bc..5ebee3d 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index 7227cf7..02ed4e9 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 CPU_TYPE:=cortex-a9
 
-LINUX_VERSION:=3.10.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
index 6cc5cfb..2caa549 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.18
+LINUX_VERSION:=3.10.21
 
 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 cf2b07a..e6b526a 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.18
+LINUX_VERSION:=3.10.21
 
 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 b89de8b..e4f7283 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.18
+LINUX_VERSION:=3.10.21
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index 9db7047..d77b926 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch b/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
index ac9aa54..42f3fa2 100644
--- a/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
+++ b/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
@@ -6,9 +6,9 @@
  static int all_symbols = 0;
 +static int uncompressed = 0;
  static char symbol_prefix_char = '\0';
+ static unsigned long long kernel_start_addr = 0;
  
- int token_profit[0x10000];
-@@ -360,6 +361,9 @@ static void write_src(void)
+@@ -367,6 +368,9 @@ static void write_src(void)
  
  	free(markers);
  
@@ -18,7 +18,7 @@
  	output_label("kallsyms_token_table");
  	off = 0;
  	for (i = 0; i < 256; i++) {
-@@ -418,6 +422,9 @@ static void *find_token(unsigned char *s
+@@ -425,6 +429,9 @@ static void *find_token(unsigned char *s
  {
  	int i;
  
@@ -28,7 +28,7 @@
  	for (i = 0; i < len - 1; i++) {
  		if (str[i] == token[0] && str[i+1] == token[1])
  			return &str[i];
-@@ -490,6 +497,9 @@ static void optimize_result(void)
+@@ -497,6 +504,9 @@ static void optimize_result(void)
  {
  	int i, best;
  
@@ -38,10 +38,10 @@
  	/* using the '\0' symbol last allows compress_symbols to use standard
  	 * fast string functions */
  	for (i = 255; i >= 0; i--) {
-@@ -646,7 +656,9 @@ int main(int argc, char **argv)
- 				if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
- 					p++;
- 				symbol_prefix_char = *p;
+@@ -656,7 +666,9 @@ int main(int argc, char **argv)
+ 			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+ 				const char *p = &argv[i][14];
+ 				kernel_start_addr = strtoull(p, NULL, 16);
 -			} else
 +			} else if (strcmp(argv[i], "--uncompressed") == 0)
 +				uncompressed = 1;
@@ -71,9 +71,9 @@
  
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -82,6 +82,10 @@ kallsyms()
- 		kallsymopt="${kallsymopt} --all-symbols"
- 	fi
+@@ -84,6 +84,10 @@ kallsyms()
+ 
+ 	kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
  
 +	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
 +		kallsymopt="${kallsymopt} --uncompressed"
diff --git a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 4614d8e..7e8e526 100644
--- a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -127,7 +127,7 @@
  static const struct rt6_info ip6_blk_hole_entry_template = {
  	.dst = {
  		.__refcnt	= ATOMIC_INIT(1),
-@@ -1505,6 +1523,9 @@ int ip6_route_add(struct fib6_config *cf
+@@ -1508,6 +1526,9 @@ int ip6_route_add(struct fib6_config *cf
  		case RTN_THROW:
  			rt->dst.error = -EAGAIN;
  			break;
@@ -137,7 +137,7 @@
  		default:
  			rt->dst.error = -ENETUNREACH;
  			break;
-@@ -2084,6 +2105,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2087,6 +2108,17 @@ static int ip6_pkt_prohibit_out(struct s
  	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -155,7 +155,7 @@
  #endif
  
  /*
-@@ -2290,7 +2322,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2293,7 +2325,8 @@ static int rtm_to_fib6_config(struct sk_
  	if (rtm->rtm_type == RTN_UNREACHABLE ||
  	    rtm->rtm_type == RTN_BLACKHOLE ||
  	    rtm->rtm_type == RTN_PROHIBIT ||
@@ -165,7 +165,7 @@
  		cfg->fc_flags |= RTF_REJECT;
  
  	if (rtm->rtm_type == RTN_LOCAL)
-@@ -2492,6 +2525,9 @@ static int rt6_fill_node(struct net *net
+@@ -2495,6 +2528,9 @@ static int rt6_fill_node(struct net *net
  		case -EACCES:
  			rtm->rtm_type = RTN_PROHIBIT;
  			break;
@@ -175,7 +175,7 @@
  		case -EAGAIN:
  			rtm->rtm_type = RTN_THROW;
  			break;
-@@ -2742,6 +2778,8 @@ static int ip6_route_dev_notify(struct n
+@@ -2745,6 +2781,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -184,7 +184,7 @@
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3002,6 +3040,17 @@ static int __net_init ip6_route_net_init
+@@ -3005,6 +3043,17 @@ static int __net_init ip6_route_net_init
  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
  			 ip6_template_metrics, true);
@@ -202,7 +202,7 @@
  #endif
  
  	net->ipv6.sysctl.flush_delay = 0;
-@@ -3020,6 +3069,8 @@ out:
+@@ -3023,6 +3072,8 @@ out:
  	return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -211,7 +211,7 @@
  out_ip6_prohibit_entry:
  	kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -3037,6 +3088,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3040,6 +3091,7 @@ static void __net_exit ip6_route_net_exi
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	kfree(net->ipv6.ip6_prohibit_entry);
  	kfree(net->ipv6.ip6_blk_hole_entry);
@@ -219,7 +219,7 @@
  #endif
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }
-@@ -3133,6 +3185,9 @@ int __init ip6_route_init(void)
+@@ -3136,6 +3188,9 @@ int __init ip6_route_init(void)
  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index ffbc351..e8d558e 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 71e8402..4538d78 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 9ddcc79..1861243 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 <kaloz@openwrt.org>
 
-LINUX_VERSION:=3.10.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 35d0a8b..8a7f88d 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.18
+LINUX_VERSION:=3.10.21
 
 CPU_TYPE:=mips32r2
 
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 22526cf..78aadd1 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
-@@ -4036,7 +4036,7 @@ hub_port_init (struct usb_hub *hub, stru
+@@ -4053,7 +4053,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 fc521b9..2b7dff8 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.18
+LINUX_VERSION:=3.10.21
 
 DEVICE_TYPE:=developerboard
 
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 3e7cd38..2f4bcc9 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch b/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch
index a1877be..77cbc67 100644
--- a/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch
+++ b/target/linux/mpc85xx/patches-3.10/200-fix_gianfar_napi_poll.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/freescale/gianfar.c
 +++ b/drivers/net/ethernet/freescale/gianfar.c
-@@ -2835,7 +2835,7 @@ static int gfar_poll(struct napi_struct 
+@@ -2835,7 +2835,7 @@ static int gfar_poll(struct napi_struct
  	struct gfar_priv_rx_q *rx_queue = NULL;
  	int work_done = 0, work_done_per_q = 0;
  	int i, budget_per_q = 0;
@@ -9,7 +9,7 @@
  	unsigned long rstat_rxf;
  	int num_act_queues;
  
-@@ -2850,62 +2850,48 @@ static int gfar_poll(struct napi_struct 
+@@ -2850,62 +2850,48 @@ static int gfar_poll(struct napi_struct
  	if (num_act_queues)
  		budget_per_q = budget/num_act_queues;
  
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 9b96422..d6d2d54 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index 35f5186..7fd54a9 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index ede4771..03efd28 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index d5c459a..49b6696 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.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index e4aa1c0..84ce8f0 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx
 SUBTARGETS:=rt305x mt7620a mt7620n rt3883 rt288x
 FEATURES:=squashfs gpio
 
-LINUX_VERSION:=3.10.18
+LINUX_VERSION:=3.10.21
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=\
diff --git a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
index 98323b3..5ad4f35 100644
--- a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
+++ b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
@@ -46,10 +46,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c
  create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c
 
-Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h	2013-11-21 15:20:28.672444348 +0100
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
 @@ -0,0 +1,27 @@
 +/*
 + *  Ralink RT305x SoC platform device registration
@@ -78,11 +76,9 @@ Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
 +};
 +
 +#endif /* _RT305X_ESW_PLATFORM_H */
-Index: linux-3.10.18/arch/mips/ralink/rt305x.c
-===================================================================
---- linux-3.10.18.orig/arch/mips/ralink/rt305x.c	2013-11-04 13:31:29.000000000 +0100
-+++ linux-3.10.18/arch/mips/ralink/rt305x.c	2013-11-21 19:39:11.280814230 +0100
-@@ -221,6 +221,7 @@
+--- a/arch/mips/ralink/rt305x.c
++++ b/arch/mips/ralink/rt305x.c
+@@ -221,6 +221,7 @@ void __init ralink_clk_init(void)
  	}
  
  	ralink_clk_add("cpu", cpu_rate);
@@ -90,11 +86,9 @@ Index: linux-3.10.18/arch/mips/ralink/rt305x.c
  	ralink_clk_add("10000b00.spi", sys_rate);
  	ralink_clk_add("10000100.timer", wdt_rate);
  	ralink_clk_add("10000120.watchdog", wdt_rate);
-Index: linux-3.10.18/drivers/net/ethernet/Kconfig
-===================================================================
---- linux-3.10.18.orig/drivers/net/ethernet/Kconfig	2013-11-04 13:31:29.000000000 +0100
-+++ linux-3.10.18/drivers/net/ethernet/Kconfig	2013-11-21 15:20:28.672444348 +0100
-@@ -135,6 +135,7 @@
+--- a/drivers/net/ethernet/Kconfig
++++ b/drivers/net/ethernet/Kconfig
+@@ -135,6 +135,7 @@ config ETHOC
  source "drivers/net/ethernet/packetengines/Kconfig"
  source "drivers/net/ethernet/pasemi/Kconfig"
  source "drivers/net/ethernet/qlogic/Kconfig"
@@ -102,11 +96,9 @@ Index: linux-3.10.18/drivers/net/ethernet/Kconfig
  source "drivers/net/ethernet/realtek/Kconfig"
  source "drivers/net/ethernet/renesas/Kconfig"
  source "drivers/net/ethernet/rdc/Kconfig"
-Index: linux-3.10.18/drivers/net/ethernet/Makefile
-===================================================================
---- linux-3.10.18.orig/drivers/net/ethernet/Makefile	2013-11-04 13:31:29.000000000 +0100
-+++ linux-3.10.18/drivers/net/ethernet/Makefile	2013-11-21 15:20:28.672444348 +0100
-@@ -53,6 +53,7 @@
+--- a/drivers/net/ethernet/Makefile
++++ b/drivers/net/ethernet/Makefile
+@@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o
  obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
  obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
  obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
@@ -114,10 +106,8 @@ Index: linux-3.10.18/drivers/net/ethernet/Makefile
  obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
  obj-$(CONFIG_SH_ETH) += renesas/
  obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
-Index: linux-3.10.18/drivers/net/ethernet/ralink/Kconfig
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/Kconfig	2013-11-21 15:20:28.672444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/Kconfig
 @@ -0,0 +1,32 @@
 +config NET_RALINK
 +	tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver"
@@ -151,10 +141,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/Kconfig
 +	select PHYLIB
 +	select SWCONFIG
 +endif
-Index: linux-3.10.18/drivers/net/ethernet/ralink/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/Makefile	2013-11-21 15:20:28.672444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/Makefile
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Ralink SoCs built-in ethernet macs
@@ -174,10 +162,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/Makefile
 +ralink-eth-$(CONFIG_SOC_MT7620)			+= soc_mt7620.o
 +
 +obj-$(CONFIG_NET_RALINK)			+= ralink-eth.o
-Index: linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.c	2013-11-21 15:20:28.676444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/esw_rt3052.c
 @@ -0,0 +1,1463 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -1642,10 +1628,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.c
 +{
 +	platform_driver_unregister(&esw_driver);
 +}
-Index: linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.h	2013-11-21 15:20:28.676444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/esw_rt3052.h
 @@ -0,0 +1,32 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -1679,10 +1663,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/esw_rt3052.h
 +
 +#endif
 +#endif
-Index: linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.c	2013-11-21 15:20:28.676444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c
 @@ -0,0 +1,566 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2250,10 +2232,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.c
 +
 +	return 0;
 +}
-Index: linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.h	2013-11-21 15:20:28.676444348 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h
 @@ -0,0 +1,30 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2285,10 +2265,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/gsw_mt7620a.h
 +extern int mt7620a_has_carrier(struct fe_priv *priv);
 +
 +#endif
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mdio.c	2013-11-21 15:20:28.680444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio.c
 @@ -0,0 +1,244 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2534,10 +2512,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio.c
 +	of_node_put(priv->mii_bus->dev.of_node);
 +	kfree(priv->mii_bus);
 +}
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mdio.h	2013-11-21 15:20:28.680444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio.h
 @@ -0,0 +1,29 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2568,10 +2544,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio.h
 +static inline void fe_mdio_cleanup(struct fe_priv *priv) {}
 +#endif
 +#endif
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.c	2013-11-21 15:20:28.680444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio_rt2880.c
 @@ -0,0 +1,232 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2805,10 +2779,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.c
 +
 +	return;
 +}
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.h	2013-11-21 15:20:28.680444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio_rt2880.h
 @@ -0,0 +1,26 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2836,10 +2808,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mdio_rt2880.h
 +void rt2880_port_init(struct fe_priv *priv, struct device_node *np);
 +
 +#endif
-Index: linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.c	2013-11-21 17:11:49.492603543 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
 @@ -0,0 +1,769 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -3610,10 +3580,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.c
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC");
-Index: linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.h	2013-11-21 17:05:21.368594293 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h
 @@ -0,0 +1,380 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -3995,10 +3963,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/ralink_soc_eth.h
 +u32 fe_r32(unsigned reg);
 +
 +#endif /* FE_ETH_H */
-Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c	2013-11-21 17:13:18.808605675 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_mt7620.c
 @@ -0,0 +1,154 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4154,10 +4120,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_mt7620.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt2880.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/soc_rt2880.c	2013-11-21 15:20:28.684444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt2880.c
 @@ -0,0 +1,51 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4210,10 +4174,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt2880.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt305x.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/soc_rt305x.c	2013-11-21 15:20:28.684444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt305x.c
 @@ -0,0 +1,113 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4328,10 +4290,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt305x.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt3883.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/soc_rt3883.c	2013-11-21 15:20:28.684444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt3883.c
 @@ -0,0 +1,60 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4393,10 +4353,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/soc_rt3883.c
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
 +
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c	2013-11-21 19:36:18.720810129 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mt7530.c
 @@ -0,0 +1,467 @@
 +/*
 + * This program is free software; you can redistribute it and/or
@@ -4865,10 +4823,8 @@ Index: linux-3.10.18/drivers/net/ethernet/ralink/mt7530.c
 +
 +	return 0;
 +}
-Index: linux-3.10.18/drivers/net/ethernet/ralink/mt7530.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/net/ethernet/ralink/mt7530.h	2013-11-21 15:20:28.684444349 +0100
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mt7530.h
 @@ -0,0 +1,20 @@
 +/*
 + * This program is free software; you can redistribute it and/or
diff --git a/target/linux/ramips/patches-3.10/0250-nand-7620.patch b/target/linux/ramips/patches-3.10/0250-nand-7620.patch
index c9a845d..248e82c 100644
--- a/target/linux/ramips/patches-3.10/0250-nand-7620.patch
+++ b/target/linux/ramips/patches-3.10/0250-nand-7620.patch
@@ -14,11 +14,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  create mode 100644 drivers/mtd/maps/ralink_nand.c
  create mode 100644 drivers/mtd/maps/ralink_nand.h
 
-Index: linux-3.10.18/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-3.10.18.orig/drivers/mtd/maps/Kconfig	2013-11-17 17:50:02.049020043 +0100
-+++ linux-3.10.18/drivers/mtd/maps/Kconfig	2013-11-17 17:51:50.545024547 +0100
-@@ -424,4 +424,8 @@
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -424,4 +424,8 @@ config MTD_LATCH_ADDR
  
            If compiled as a module, it will be called latch-addr-flash.
  
@@ -27,20 +25,16 @@ Index: linux-3.10.18/drivers/mtd/maps/Kconfig
 +	depends on RALINK && SOC_MT7620
 +
  endmenu
-Index: linux-3.10.18/drivers/mtd/maps/Makefile
-===================================================================
---- linux-3.10.18.orig/drivers/mtd/maps/Makefile	2013-11-17 17:50:02.049020043 +0100
-+++ linux-3.10.18/drivers/mtd/maps/Makefile	2013-11-17 17:51:50.545024547 +0100
-@@ -46,3 +46,5 @@
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -46,3 +46,5 @@ obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o
  obj-$(CONFIG_MTD_GPIO_ADDR)	+= gpio-addr-flash.o
  obj-$(CONFIG_MTD_LATCH_ADDR)	+= latch-addr-flash.o
  obj-$(CONFIG_MTD_LANTIQ)	+= lantiq-flash.o
 +obj-$(CONFIG_MTD_NAND_MT7620)	+= ralink_nand.o
 +
-Index: linux-3.10.18/drivers/mtd/maps/ralink_nand.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/mtd/maps/ralink_nand.c	2013-11-17 17:51:50.549024547 +0100
+--- /dev/null
++++ b/drivers/mtd/maps/ralink_nand.c
 @@ -0,0 +1,2136 @@
 +#define DEBUG
 +#include <linux/device.h>
@@ -2178,10 +2172,8 @@ Index: linux-3.10.18/drivers/mtd/maps/ralink_nand.c
 +
 +
 +MODULE_LICENSE("GPL");
-Index: linux-3.10.18/drivers/mtd/maps/ralink_nand.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/drivers/mtd/maps/ralink_nand.h	2013-11-17 17:51:50.549024547 +0100
+--- /dev/null
++++ b/drivers/mtd/maps/ralink_nand.h
 @@ -0,0 +1,232 @@
 +#ifndef RT2880_NAND_H
 +#define RT2880_NAND_H
diff --git a/target/linux/ramips/patches-3.10/999-mt7620n.patch b/target/linux/ramips/patches-3.10/999-mt7620n.patch
index 391b590..da5c6f9 100644
--- a/target/linux/ramips/patches-3.10/999-mt7620n.patch
+++ b/target/linux/ramips/patches-3.10/999-mt7620n.patch
@@ -1,7 +1,5 @@
-Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/mt7620.h
-===================================================================
---- linux-3.10.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h	2013-11-17 17:50:01.773020032 +0100
-+++ linux-3.10.18/arch/mips/include/asm/mach-ralink/mt7620.h	2013-11-17 17:52:24.373025950 +0100
+--- a/arch/mips/include/asm/mach-ralink/mt7620.h
++++ b/arch/mips/include/asm/mach-ralink/mt7620.h
 @@ -24,11 +24,8 @@
  #define SYSC_REG_CPLL_CONFIG0		0x54
  #define SYSC_REG_CPLL_CONFIG1		0x58
@@ -16,11 +14,9 @@ Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/mt7620.h
  
  #define CHIP_REV_PKG_MASK		0x1
  #define CHIP_REV_PKG_SHIFT		16
-Index: linux-3.10.18/arch/mips/ralink/mt7620.c
-===================================================================
---- linux-3.10.18.orig/arch/mips/ralink/mt7620.c	2013-11-17 17:50:01.773020032 +0100
-+++ linux-3.10.18/arch/mips/ralink/mt7620.c	2013-11-17 17:52:24.373025950 +0100
-@@ -167,22 +167,27 @@
+--- a/arch/mips/ralink/mt7620.c
++++ b/arch/mips/ralink/mt7620.c
+@@ -167,22 +167,27 @@ void prom_soc_init(struct ralink_soc_inf
  	u32 cfg0;
  	u32 pmu0;
  	u32 pmu1;
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 8a6a281..fb39dbc 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.18
+LINUX_VERSION:=3.10.21
 
 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 0524144..61cf3eb 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.18
+LINUX_VERSION:=3.10.21
 
 DEVICE_TYPE:=developerboard
 
diff --git a/target/linux/sparc/Makefile b/target/linux/sparc/Makefile
index a50f5f8..d838059 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.18
+LINUX_VERSION:=3.10.21
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index 028874b..b6744b0 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.18
+LINUX_VERSION:=3.10.21
 CS5535_MASK:=0x0b000042
 
 CPU_TYPE := geode
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index 348779d..b4eab5e 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,6 +1,6 @@
 BOARDNAME:=Generic
 
-LINUX_VERSION:=3.10.18
+LINUX_VERSION:=3.10.21
 
 define Target/Description
 	Build firmware images for x86 based boards
diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile
index 351ca74..717298b 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.18
+LINUX_VERSION:=3.10.21
 
 DEVICE_TYPE=other