kernel: update 3.10 to 3.10.18

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

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b8ff3cefd4894aab3a38140b355378c0d8438561..91752e016761e3e838fdd30ace270e69ae34a4bd 100644 (file)
--- 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.9.11)
   LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
 endif

-ifeq ($(LINUX_VERSION),3.10.17)
-  LINUX_KERNEL_MD5SUM:=0c52d1266fe1087bcfa6517646188ecc
+ifeq ($(LINUX_VERSION),3.10.18)
+  LINUX_KERNEL_MD5SUM:=e091753da622788cfd662dd67c2f9b48

 endif
 
 # disable the md5sum check for unknown kernel versions
 endif
 
 # disable the md5sum check for unknown kernel versions

diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index 74321a2f24ad576f9dfffc7b4e7428bc04415b0f..ab0e69451f82cb4c247c57f78d8d750979c3d856 100644 (file)
--- 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
 
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 SUBTARGETS:=generic ac49x
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 8c7a1d653036bd2b62036f73e5ae411e3b7091c1..2491bc63084479025e6bc0efa4a85625f73f519b 100644 (file)
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=mips16
 CPU_TYPE=34kc
 SUBTARGETS:=generic nand mikrotik
 
 CPU_TYPE=34kc
 SUBTARGETS:=generic nand mikrotik
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
index ce55abdf50f5c63b50c69387d7797ffe120771ca..1807dfb2edac8959f7d205b9d4de97dbc51a4dd3 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
@@ -775,7 +775,7 @@
  #define IP_TTL                2
 --- a/net/core/secure_seq.c
 +++ b/net/core/secure_seq.c
  #define IP_TTL                2
 --- a/net/core/secure_seq.c
 +++ b/net/core/secure_seq.c

-@@ -54,11 +54,12 @@ __u32 secure_tcpv6_sequence_number(const
+@@ -56,11 +56,12 @@ __u32 secure_tcpv6_sequence_number(const

        u32 secret[MD5_MESSAGE_BYTES / 4];
        u32 hash[MD5_DIGEST_WORDS];
        u32 i;
        u32 secret[MD5_MESSAGE_BYTES / 4];
        u32 hash[MD5_DIGEST_WORDS];
        u32 i;


@@ -789,7 +789,7 @@
        secret[4] = net_secret[4] +
                (((__force u16)sport << 16) + (__force u16)dport);
        for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
        secret[4] = net_secret[4] +
                (((__force u16)sport << 16) + (__force u16)dport);
        for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)

-@@ -76,11 +77,12 @@ u32 secure_ipv6_port_ephemeral(const __b
+@@ -78,11 +79,12 @@ u32 secure_ipv6_port_ephemeral(const __b

        u32 secret[MD5_MESSAGE_BYTES / 4];
        u32 hash[MD5_DIGEST_WORDS];
        u32 i;
        u32 secret[MD5_MESSAGE_BYTES / 4];
        u32 hash[MD5_DIGEST_WORDS];
        u32 i;


@@ -803,7 +803,7 @@
        secret[4] = net_secret[4] + (__force u32)dport;
        for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
                secret[i] = net_secret[i];
        secret[4] = net_secret[4] + (__force u32)dport;
        for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
                secret[i] = net_secret[i];

-@@ -183,11 +185,12 @@ u64 secure_dccpv6_sequence_number(__be32
+@@ -185,11 +187,12 @@ u64 secure_dccpv6_sequence_number(__be32

        u32 hash[MD5_DIGEST_WORDS];
        u64 seq;
        u32 i;
        u32 hash[MD5_DIGEST_WORDS];
        u64 seq;
        u32 i;


@@ -886,7 +886,7 @@
                tpi->seq = 0;
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
                tpi->seq = 0;
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c

-@@ -3592,14 +3592,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3625,14 +3625,16 @@ static bool tcp_parse_aligned_timestamp(

  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  

diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index fad82921a587cc29b752e615d519953fac7b3b15..c8be8bc6261118b585ed7bda3dd273a082f302d6 100644 (file)
--- 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>
 
 FEATURES:=squashfs
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index f1cd5a8aa025c3981dca2e4f9f8c5b1d6cce897b..69ca530dcb84eb8c8590091fc53b6f57375736ae 100644 (file)
--- 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
 
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfp
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
index 57d5af6016ebc57022544c37deadb1cd847f809f..6cc5cfbe91d4c0b10283fe3a4fe14d5addbeb2b3 100644 (file)
--- 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
 
 CPU_TYPE:=arm1176jzf-s
 CPU_SUBTYPE:=vfp
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835
 
 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 09fd152d3311e35035812c899fdcabc6236fec13..cf2b07ab798cf9c4b54b9794430d2b4654244684 100644 (file)
--- 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>
 
 FEATURES:=squashfs usb pcmcia
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram
 
 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 34b608b35ab35f83a56eb42f3fe91d829c8b0427..b89de8b1d26bd0431774531cf88f77ec5c7efc2f 100644 (file)
--- 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
 BOARDNAME:=Broadcom BCM63xx
 SUBTARGETS:=generic smp
 FEATURES:=squashfs usb atm pci pcmcia

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk

diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index 09032729e9f1a7342da46ac7e651ad96ff436855..9db70476178f09c3fd96545ac65e8429923b4f8f 100644 (file)
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
 FEATURES:=squashfs
 CPU_TYPE:=fa526
 
 FEATURES:=squashfs
 CPU_TYPE:=fa526
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/generic/patches-3.10/655-increase_skb_pad.patch b/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
index 6e10a1ace4592863891023410f2ba4deb08c1d95..590fa1686cb1f47ec3961cda92deb1b7af9b794b 100644 (file)
--- a/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
+++ b/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -1848,7 +1848,7 @@ static inline int pskb_network_may_pull(
+@@ -1853,7 +1853,7 @@ static inline int pskb_network_may_pull(

   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD

diff --git a/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch b/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
index 59cfa6a3b62d0257a26537545e8d7a460150aee6..86b7e1ff3b99f2cd564fcaf2296cb957ed9bb8d9 100644 (file)
--- a/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
+++ b/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
@@ -14,7 +14,7 @@ when needed.
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -1893,6 +1893,24 @@ static inline void pskb_trim_unique(stru
+@@ -1898,6 +1898,24 @@ static inline void pskb_trim_unique(stru

        BUG_ON(err);
  }
  
        BUG_ON(err);
  }
  

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 556adcc935cf5054d3ba3d62ef5e084fbe3a56ae..4614d8ebaf049ca05dad36de55119bde119a2d6b 100644 (file)
--- 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),
  static const struct rt6_info ip6_blk_hole_entry_template = {
        .dst = {
                .__refcnt       = ATOMIC_INIT(1),

-@@ -1481,6 +1499,9 @@ int ip6_route_add(struct fib6_config *cf
+@@ -1505,6 +1523,9 @@ int ip6_route_add(struct fib6_config *cf

                case RTN_THROW:
                        rt->dst.error = -EAGAIN;
                        break;
                case RTN_THROW:
                        rt->dst.error = -EAGAIN;
                        break;


@@ -137,7 +137,7 @@
                default:
                        rt->dst.error = -ENETUNREACH;
                        break;
                default:
                        rt->dst.error = -ENETUNREACH;
                        break;

-@@ -2057,6 +2078,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2084,6 +2105,17 @@ static int ip6_pkt_prohibit_out(struct s

        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  


@@ -155,7 +155,7 @@
  #endif
  
  /*
  #endif
  
  /*

-@@ -2262,7 +2294,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2290,7 +2322,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 ||
        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)
                cfg->fc_flags |= RTF_REJECT;
  
        if (rtm->rtm_type == RTN_LOCAL)

-@@ -2464,6 +2497,9 @@ static int rt6_fill_node(struct net *net
+@@ -2492,6 +2525,9 @@ static int rt6_fill_node(struct net *net

                case -EACCES:
                        rtm->rtm_type = RTN_PROHIBIT;
                        break;
                case -EACCES:
                        rtm->rtm_type = RTN_PROHIBIT;
                        break;


@@ -175,7 +175,7 @@
                case -EAGAIN:
                        rtm->rtm_type = RTN_THROW;
                        break;
                case -EAGAIN:
                        rtm->rtm_type = RTN_THROW;
                        break;

-@@ -2714,6 +2750,8 @@ static int ip6_route_dev_notify(struct n
+@@ -2742,6 +2778,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);
  #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
                net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
                net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif

-@@ -2974,6 +3012,17 @@ static int __net_init ip6_route_net_init
+@@ -3002,6 +3040,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);
        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;
  #endif
  
        net->ipv6.sysctl.flush_delay = 0;

-@@ -2992,6 +3041,8 @@ out:
+@@ -3020,6 +3069,8 @@ out:

        return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        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:
  out_ip6_prohibit_entry:
        kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:

-@@ -3009,6 +3060,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3037,6 +3088,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);
  #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);
  }
  #endif
        dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }

-@@ -3105,6 +3157,9 @@ int __init ip6_route_init(void)
+@@ -3133,6 +3185,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);
        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/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch
index 869200787fa2b75968192290031e31b0a6724bbc..f678ef42e2c3c8be1365eabf01958487c7017ec8 100644 (file)
--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/721-phy_packets.patch
@@ -34,7 +34,7 @@
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -1878,6 +1878,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1883,6 +1883,10 @@ static inline int pskb_trim(struct sk_bu

        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  


@@ -45,7 +45,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter

-@@ -2002,16 +2006,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2007,16 +2011,6 @@ static inline struct sk_buff *dev_alloc_

  }
  
  
  }
  
  

diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index d3d6aaaca4db53df9df5054f098d6ea9cb19b8ce..fd50eb1a28d8cfe264a873a7246c246e3d44468c 100644 (file)
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c

-@@ -2838,6 +2838,8 @@ static __net_initdata struct pernet_oper
+@@ -2839,6 +2839,8 @@ static __net_initdata struct pernet_oper

  
  static int __init proto_init(void)
  {
  
  static int __init proto_init(void)
  {

diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index b3f06e8c6ff70fcbba5385d72b5f307fbf757525..ffbc351354885d688a4ba28a387aa32c566ee737 100644 (file)
--- 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>
 
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index cf18ef76b3f70b71c4d8e5da9189a6758487c859..71e8402ac50db03d485908ef29b79b38fc4b3332 100644 (file)
--- 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
 
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic harddisk
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 60af7a2443b5fd079316c40a0a363ff91d484c44..9ddcc79c6b1be9c54f00540bab2ddc66b408dc97 100644 (file)
--- 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>
 
 CPU_TYPE:=xscale
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch b/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch
index 09749851053365948da2cee6bb56a85b64155043..8e3887f5d0b9d160b2d3a50c0ccef6d43b90ed30 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch
+++ b/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c

-@@ -2805,7 +2805,7 @@ static int mv643xx_eth_remove(struct pla
+@@ -2803,7 +2803,7 @@ static int mv643xx_eth_remove(struct pla

  
        unregister_netdev(mp->dev);
        if (mp->phy != NULL)
  
        unregister_netdev(mp->dev);
        if (mp->phy != NULL)

diff --git a/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch
index caf4d108505b02066bb03d8033b5e5808e80358f..a7c56284822eede1fdb7e2769a7665fc6fc6f3dd 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch
+++ b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c

-@@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(stru
+@@ -2469,7 +2469,7 @@ static int mv643xx_eth_shared_probe(stru

        if (msp == NULL)
                return -ENOMEM;
  
        if (msp == NULL)
                return -ENOMEM;
  


@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (msp->base == NULL)
                return -ENOMEM;
  
        if (msp->base == NULL)
                return -ENOMEM;
  

-@@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(str
+@@ -2497,7 +2497,6 @@ static int mv643xx_eth_shared_remove(str

  {
        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
  
  {
        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
  

diff --git a/target/linux/kirkwood/patches-3.10/0023-net-mv643xx_eth-use-of_phy_connect-if-phy_node-prese.patch b/target/linux/kirkwood/patches-3.10/0023-net-mv643xx_eth-use-of_phy_connect-if-phy_node-prese.patch
index 71e1a398aec94b6bc9d08c909a7d5cc2fc345f37..3179b901f77e794665d94991d89a8ac6e105a8c2 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0023-net-mv643xx_eth-use-of_phy_connect-if-phy_node-prese.patch
+++ b/target/linux/kirkwood/patches-3.10/0023-net-mv643xx_eth-use-of_phy_connect-if-phy_node-prese.patch
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  static char mv643xx_eth_driver_name[] = "mv643xx_eth";
  static char mv643xx_eth_driver_version[] = "1.4";
  
  static char mv643xx_eth_driver_name[] = "mv643xx_eth";
  static char mv643xx_eth_driver_version[] = "1.4";

-@@ -2715,17 +2716,27 @@ static int mv643xx_eth_probe(struct plat
+@@ -2714,17 +2715,27 @@ static int mv643xx_eth_probe(struct plat

        netif_set_real_num_tx_queues(dev, mp->txq_count);
        netif_set_real_num_rx_queues(dev, mp->rxq_count);
  
        netif_set_real_num_tx_queues(dev, mp->txq_count);
        netif_set_real_num_rx_queues(dev, mp->rxq_count);
  

diff --git a/target/linux/kirkwood/patches-3.10/0024-net-mv643xx_eth-proper-initialization-for-Kirkwood-S.patch b/target/linux/kirkwood/patches-3.10/0024-net-mv643xx_eth-proper-initialization-for-Kirkwood-S.patch
index 50bafd3474ade2b6621ee3eef07575268eb0aeb4..7cf45a0db0f624f62ca8736c3916e4fadbd64d04 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0024-net-mv643xx_eth-proper-initialization-for-Kirkwood-S.patch
+++ b/target/linux/kirkwood/patches-3.10/0024-net-mv643xx_eth-proper-initialization-for-Kirkwood-S.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #define TX_BW_RATE                    0x0050
  #define TX_BW_MTU                     0x0058
  #define TX_BW_BURST                   0x005c
  #define TX_BW_RATE                    0x0050
  #define TX_BW_MTU                     0x0058
  #define TX_BW_BURST                   0x005c

-@@ -2701,6 +2703,15 @@ static int mv643xx_eth_probe(struct plat
+@@ -2700,6 +2702,15 @@ static int mv643xx_eth_probe(struct plat

  
        mp->dev = dev;
  
  
        mp->dev = dev;
  

diff --git a/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch b/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch
index 897b2617455a97bba3e8a784ed14b21e5fab9dd1..e0eac008be867b982855fa94772b20ea8d4689e7 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch
+++ b/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #include <linux/of_mdio.h>
  
  static char mv643xx_eth_driver_name[] = "mv643xx_eth";
  #include <linux/of_mdio.h>
  
  static char mv643xx_eth_driver_name[] = "mv643xx_eth";

-@@ -2453,13 +2456,148 @@ static void infer_hw_params(struct mv643
+@@ -2452,13 +2455,148 @@ static void infer_hw_params(struct mv643

        }
  }
  
        }
  }
  


@@ -266,7 +266,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (!mv643xx_eth_version_printed++)
                pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",
  
        if (!mv643xx_eth_version_printed++)
                pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",

-@@ -2472,6 +2610,7 @@ static int mv643xx_eth_shared_probe(stru
+@@ -2471,6 +2609,7 @@ static int mv643xx_eth_shared_probe(stru

        msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
        if (msp == NULL)
                return -ENOMEM;
        msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
        if (msp == NULL)
                return -ENOMEM;


@@ -274,7 +274,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (msp->base == NULL)
  
        msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (msp->base == NULL)

-@@ -2488,12 +2627,15 @@ static int mv643xx_eth_shared_probe(stru
+@@ -2487,12 +2626,15 @@ static int mv643xx_eth_shared_probe(stru

        if (dram)
                mv643xx_eth_conf_mbus_windows(msp, dram);
  
        if (dram)
                mv643xx_eth_conf_mbus_windows(msp, dram);
  


@@ -292,7 +292,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return 0;
  }
  
        return 0;
  }
  

-@@ -2501,9 +2643,9 @@ static int mv643xx_eth_shared_remove(str
+@@ -2500,9 +2642,9 @@ static int mv643xx_eth_shared_remove(str

  {
        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
  
  {
        struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
  


@@ -303,7 +303,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return 0;
  }
  
        return 0;
  }
  

-@@ -2513,6 +2655,7 @@ static struct platform_driver mv643xx_et
+@@ -2512,6 +2654,7 @@ static struct platform_driver mv643xx_et

        .driver = {
                .name   = MV643XX_ETH_SHARED_NAME,
                .owner  = THIS_MODULE,
        .driver = {
                .name   = MV643XX_ETH_SHARED_NAME,
                .owner  = THIS_MODULE,


@@ -311,7 +311,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -2721,6 +2864,8 @@ static int mv643xx_eth_probe(struct plat
+@@ -2720,6 +2863,8 @@ static int mv643xx_eth_probe(struct plat

        if (!IS_ERR(mp->clk)) {
                clk_prepare_enable(mp->clk);
                mp->t_clk = clk_get_rate(mp->clk);
        if (!IS_ERR(mp->clk)) {
                clk_prepare_enable(mp->clk);
                mp->t_clk = clk_get_rate(mp->clk);

diff --git a/target/linux/kirkwood/patches-3.10/0029-net-mv643xx_eth-do-not-use-port-number-as-platform-d.patch b/target/linux/kirkwood/patches-3.10/0029-net-mv643xx_eth-do-not-use-port-number-as-platform-d.patch
index 84ac77991cc0c3ba9bbe721057a38623469d63dd..12e522a1f840391fe54af58cd5a813a85d0f18e3 100644 (file)
--- a/target/linux/kirkwood/patches-3.10/0029-net-mv643xx_eth-do-not-use-port-number-as-platform-d.patch
+++ b/target/linux/kirkwood/patches-3.10/0029-net-mv643xx_eth-do-not-use-port-number-as-platform-d.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
 
 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c

-@@ -2483,6 +2483,7 @@ static int mv643xx_eth_shared_of_add_por
+@@ -2482,6 +2482,7 @@ static int mv643xx_eth_shared_of_add_por

        struct resource res;
        const char *mac_addr;
        int ret;
        struct resource res;
        const char *mac_addr;
        int ret;


@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        memset(&ppd, 0, sizeof(ppd));
        ppd.shared = pdev;
  
        memset(&ppd, 0, sizeof(ppd));
        ppd.shared = pdev;

-@@ -2503,6 +2504,14 @@ static int mv643xx_eth_shared_of_add_por
+@@ -2502,6 +2503,14 @@ static int mv643xx_eth_shared_of_add_por

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  


@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        mac_addr = of_get_mac_address(pnp);
        if (mac_addr)
                memcpy(ppd.mac_addr, mac_addr, 6);
        mac_addr = of_get_mac_address(pnp);
        if (mac_addr)
                memcpy(ppd.mac_addr, mac_addr, 6);

-@@ -2521,7 +2530,7 @@ static int mv643xx_eth_shared_of_add_por
+@@ -2520,7 +2529,7 @@ static int mv643xx_eth_shared_of_add_por

                of_property_read_u32(pnp, "duplex", &ppd.duplex);
        }
  
                of_property_read_u32(pnp, "duplex", &ppd.duplex);
        }
  


@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (!ppdev)
                return -ENOMEM;
        ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
        if (!ppdev)
                return -ENOMEM;
        ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

-@@ -2538,7 +2547,7 @@ static int mv643xx_eth_shared_of_add_por
+@@ -2537,7 +2546,7 @@ static int mv643xx_eth_shared_of_add_por

        if (ret)
                goto port_err;
  
        if (ret)
                goto port_err;
  

diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 7b157540123275fc4ae855c329d8c2a7c208ab1e..35d0a8b2b39b0cddbda947209fb291e92fd75fdb 100644 (file)
--- 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
 
 FEATURES:=squashfs
 SUBTARGETS=xway xrx200 ase falcon
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 CPU_TYPE:=mips32r2
 
 
 CPU_TYPE:=mips32r2
 

diff --git a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
index 056f5177fa28014a26d1b9cb99160c874e48661d..1911b4451ed08b48c671c3fd8a02cc5e85ea9f43 100644 (file)
--- a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
+++ b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
@@ -164,7 +164,7 @@
                                 enum mtd_parser_type type,
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
                                 enum mtd_parser_type type,
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c

-@@ -616,7 +616,7 @@ out_register:
+@@ -615,7 +615,7 @@ out_register:

  }
  
  
  }
  
  


@@ -173,7 +173,7 @@
  __mtd_add_partition(struct mtd_info *master, char *name,
                    long long offset, long long length, bool dup_check)
  {
  __mtd_add_partition(struct mtd_info *master, char *name,
                    long long offset, long long length, bool dup_check)
  {

-@@ -737,7 +737,7 @@ run_parsers_by_type(struct mtd_part *sla
+@@ -736,7 +736,7 @@ run_parsers_by_type(struct mtd_part *sla

        return nr_parts;
  }
  
        return nr_parts;
  }
  


@@ -182,7 +182,7 @@
  mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
  {
        unsigned long mask = mtd->erasesize - 1;
  mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
  {
        unsigned long mask = mtd->erasesize - 1;

-@@ -806,7 +806,6 @@ static void split_uimage(struct mtd_info
+@@ -805,7 +805,6 @@ static void split_uimage(struct mtd_info

                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;
                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;

diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index c24e1b7d7ff74e9674bf745f0609d4f4e68ea3da..fc521b96ca40463e85ed1f82a7559567466fb097 100644 (file)
--- 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>
 
 INITRAMFS_EXTRA_FILES:=
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 DEVICE_TYPE:=developerboard
 
 
 DEVICE_TYPE:=developerboard
 

diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 1721e95081b4778da186bf5b5e74ba39d00e1739..3e7cd38029652bd0b6afd9ad8259278352c19891 100644 (file)
--- 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
 
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS=generic p1020
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 2b8b258482f88937d37f9911c0d2877b3327addf..9b964228e74194cd485a6dce402d9604b398e3be 100644 (file)
--- 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>
 
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/mxs/Makefile b/target/linux/mxs/Makefile
index 0f03bda8efe66387bf0e7d4d2bdaeabeab3107f5..c8de56d300eb6011fd6b5ce785243115c72a47fd 100644 (file)
--- a/target/linux/mxs/Makefile
+++ b/target/linux/mxs/Makefile
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
 CPU_TYPE:=arm926ej-s
 
 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
 CPU_TYPE:=arm926ej-s
 
 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 KERNELNAME:="zImage dtbs"
 
 define Target/Description
 KERNELNAME:="zImage dtbs"
 
 define Target/Description

diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index aeb0718ba28a216782ee96c2b7417ed99a3576d7..35f518655b9e60b087a7b3a5edefe2c9aa42921c 100644 (file)
--- 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>
 
 CPU_CFLAGS_octeon:=-march=octeon
 MAINTAINER:=John Crispin <blogic@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index 317484d72f68b8960d6c65575981111234925c23..ede477166c49bd287366e26654c17b3324233090 100644 (file)
--- 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>
 
 CPU_TYPE:=405
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index b9fc559614e7d86658967d693c04a5a4a5bacf56..d5c459a35191a667ffb60eea6682d4e0edb50a61 100644 (file)
--- 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>
 
 CPU_TYPE:=440
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 62c993fca89221cca058c703df566f4974f0bd2b..f09f1097ec659a0a9ca9fb68048b7383a200f246 100644 (file)
--- 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
 
 SUBTARGETS:=rt305x rt3883 mt7620a rt288x
 FEATURES:=squashfs gpio
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=\
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES+=\

diff --git a/target/linux/ramips/patches-3.10/0122-pinmux.patch b/target/linux/ramips/patches-3.10/0122-pinmux.patch
index af65043fc85f3fe4729b3855a1e9b271c0eb8f3e..20fc4286f275824b432d18e74598ee63514f47de 100644 (file)
--- a/target/linux/ramips/patches-3.10/0122-pinmux.patch
+++ b/target/linux/ramips/patches-3.10/0122-pinmux.patch
@@ -14,11 +14,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  6 files changed, 385 insertions(+), 19 deletions(-)
  create mode 100644 drivers/pinctrl/pinctrl-rt2880.c
 
  6 files changed, 385 insertions(+), 19 deletions(-)
  create mode 100644 drivers/pinctrl/pinctrl-rt2880.c
 

-Index: linux-3.10.17/arch/mips/Kconfig
-===================================================================
---- linux-3.10.17.orig/arch/mips/Kconfig       2013-10-26 17:19:49.094708911 +0200
-+++ linux-3.10.17/arch/mips/Kconfig    2013-10-26 17:19:49.926708932 +0200
-@@ -446,6 +446,8 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -446,6 +446,8 @@ config RALINK

        select HAVE_MACH_CLKDEV
        select CLKDEV_LOOKUP
        select ARCH_REQUIRE_GPIOLIB
        select HAVE_MACH_CLKDEV
        select CLKDEV_LOOKUP
        select ARCH_REQUIRE_GPIOLIB


@@ -27,11 +25,9 @@ Index: linux-3.10.17/arch/mips/Kconfig
  
  config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
  
  config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"

-Index: linux-3.10.17/drivers/pinctrl/Kconfig
-===================================================================
---- linux-3.10.17.orig/drivers/pinctrl/Kconfig 2013-10-18 19:44:19.000000000 +0200
-+++ linux-3.10.17/drivers/pinctrl/Kconfig      2013-10-26 17:19:49.930708931 +0200
-@@ -114,6 +114,11 @@
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
+@@ -114,6 +114,11 @@ config PINCTRL_LANTIQ

        select PINMUX
        select PINCONF
  
        select PINMUX
        select PINCONF
  


@@ -43,11 +39,9 @@ Index: linux-3.10.17/drivers/pinctrl/Kconfig
  config PINCTRL_FALCON
        bool
        depends on SOC_FALCON
  config PINCTRL_FALCON
        bool
        depends on SOC_FALCON

-Index: linux-3.10.17/drivers/pinctrl/Makefile
-===================================================================
---- linux-3.10.17.orig/drivers/pinctrl/Makefile        2013-10-18 19:44:19.000000000 +0200
-+++ linux-3.10.17/drivers/pinctrl/Makefile     2013-10-26 17:19:49.930708931 +0200
-@@ -45,6 +45,7 @@
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_PINCTRL_EXYNOS5440)     += pinc

  obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o
  obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
  obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o
  obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o
  obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
  obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o


@@ -55,10 +49,8 @@ Index: linux-3.10.17/drivers/pinctrl/Makefile
  
  obj-$(CONFIG_PLAT_ORION)        += mvebu/
  obj-$(CONFIG_ARCH_SHMOBILE)   += sh-pfc/
  
  obj-$(CONFIG_PLAT_ORION)        += mvebu/
  obj-$(CONFIG_ARCH_SHMOBILE)   += sh-pfc/

-Index: linux-3.10.17/drivers/pinctrl/pinctrl-rt2880.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.17/drivers/pinctrl/pinctrl-rt2880.c     2013-10-27 16:22:50.132754888 +0100
+--- /dev/null
++++ b/drivers/pinctrl/pinctrl-rt2880.c

 @@ -0,0 +1,466 @@
 +/*
 + *  linux/drivers/pinctrl/pinctrl-rt2880.c
 @@ -0,0 +1,466 @@
 +/*
 + *  linux/drivers/pinctrl/pinctrl-rt2880.c


@@ -526,10 +518,8 @@ Index: linux-3.10.17/drivers/pinctrl/pinctrl-rt2880.c
 +}
 +
 +core_initcall_sync(rt2880_pinmux_init);
 +}
 +
 +core_initcall_sync(rt2880_pinmux_init);

-Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/pinmux.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.17/arch/mips/include/asm/mach-ralink/pinmux.h   2013-10-27 07:28:38.999991133 +0100
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ralink/pinmux.h

 @@ -0,0 +1,53 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
 @@ -0,0 +1,53 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify


@@ -584,10 +574,8 @@ Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/pinmux.h
 +extern struct rt2880_pmx_group *rt2880_pinmux_data;
 +
 +#endif
 +extern struct rt2880_pmx_group *rt2880_pinmux_data;
 +
 +#endif

-Index: linux-3.10.17/arch/mips/ralink/mt7620.c
-===================================================================
---- linux-3.10.17.orig/arch/mips/ralink/mt7620.c       2013-10-26 17:19:49.462708921 +0200
-+++ linux-3.10.17/arch/mips/ralink/mt7620.c    2013-10-27 13:33:02.148512122 +0100
+--- a/arch/mips/ralink/mt7620.c
++++ b/arch/mips/ralink/mt7620.c

 @@ -17,6 +17,7 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
 @@ -17,6 +17,7 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>


@@ -596,7 +584,7 @@ Index: linux-3.10.17/arch/mips/ralink/mt7620.c
  
  #include "common.h"
  
  
  #include "common.h"
  

-@@ -48,118 +49,58 @@
+@@ -48,118 +49,58 @@ static int dram_type;

  /* the pll dividers */
  static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 };
  
  /* the pll dividers */
  static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 };
  


@@ -764,17 +752,15 @@ Index: linux-3.10.17/arch/mips/ralink/mt7620.c
  };
  
  void __init ralink_clk_init(void)
  };
  
  void __init ralink_clk_init(void)

-@@ -281,4 +222,6 @@
+@@ -281,4 +222,6 @@ void prom_soc_init(struct ralink_soc_inf

                (pmu0 & PMU_SW_SET) ? ("sw") : ("hw"));
        pr_info("Digital PMU set to %s control\n",
                (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw"));
 +
 +      rt2880_pinmux_data = mt7620a_pinmux_data;
  }
                (pmu0 & PMU_SW_SET) ? ("sw") : ("hw"));
        pr_info("Digital PMU set to %s control\n",
                (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw"));
 +
 +      rt2880_pinmux_data = mt7620a_pinmux_data;
  }

-Index: linux-3.10.17/arch/mips/ralink/rt305x.c
-===================================================================
---- linux-3.10.17.orig/arch/mips/ralink/rt305x.c       2013-10-26 17:19:49.722708926 +0200
-+++ linux-3.10.17/arch/mips/ralink/rt305x.c    2013-10-27 16:23:29.836755834 +0100
+--- a/arch/mips/ralink/rt305x.c
++++ b/arch/mips/ralink/rt305x.c

 @@ -17,90 +17,71 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
 @@ -17,90 +17,71 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>


@@ -924,7 +910,7 @@ Index: linux-3.10.17/arch/mips/ralink/rt305x.c
  };
  
  static void rt305x_wdt_reset(void)
  };
  
  static void rt305x_wdt_reset(void)

-@@ -114,14 +95,6 @@
+@@ -114,14 +95,6 @@ static void rt305x_wdt_reset(void)

        rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
  }
  
        rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
  }
  


@@ -939,7 +925,7 @@ Index: linux-3.10.17/arch/mips/ralink/rt305x.c
  static unsigned long rt5350_get_mem_size(void)
  {
        void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
  static unsigned long rt5350_get_mem_size(void)
  {
        void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);

-@@ -291,11 +264,14 @@
+@@ -291,11 +264,14 @@ void prom_soc_init(struct ralink_soc_inf

        soc_info->mem_base = RT305X_SDRAM_BASE;
        if (soc_is_rt5350()) {
                soc_info->mem_size = rt5350_get_mem_size();
        soc_info->mem_base = RT305X_SDRAM_BASE;
        if (soc_is_rt5350()) {
                soc_info->mem_size = rt5350_get_mem_size();


@@ -954,11 +940,9 @@ Index: linux-3.10.17/arch/mips/ralink/rt305x.c
 +              rt2880_pinmux_data = rt3352_pinmux_data;
        }
  }
 +              rt2880_pinmux_data = rt3352_pinmux_data;
        }
  }

-Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/rt305x.h
-===================================================================
---- linux-3.10.17.orig/arch/mips/include/asm/mach-ralink/rt305x.h      2013-10-18 19:44:19.000000000 +0200
-+++ linux-3.10.17/arch/mips/include/asm/mach-ralink/rt305x.h   2013-10-26 17:19:49.934708931 +0200
-@@ -125,24 +125,28 @@
+--- a/arch/mips/include/asm/mach-ralink/rt305x.h
++++ b/arch/mips/include/asm/mach-ralink/rt305x.h
+@@ -125,24 +125,28 @@ static inline int soc_is_rt5350(void)

  #define RT305X_GPIO_GE0_TXD0          40
  #define RT305X_GPIO_GE0_RXCLK         51
  
  #define RT305X_GPIO_GE0_TXD0          40
  #define RT305X_GPIO_GE0_RXCLK         51
  


@@ -1002,10 +986,8 @@ Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/rt305x.h
  
  #define RT3352_SYSC_REG_SYSCFG0               0x010
  #define RT3352_SYSC_REG_SYSCFG1         0x014
  
  #define RT3352_SYSC_REG_SYSCFG0               0x010
  #define RT3352_SYSC_REG_SYSCFG1         0x014

-Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/mt7620.h
-===================================================================
---- linux-3.10.17.orig/arch/mips/include/asm/mach-ralink/mt7620.h      2013-10-26 17:19:49.250708916 +0200
-+++ linux-3.10.17/arch/mips/include/asm/mach-ralink/mt7620.h   2013-10-27 13:13:24.892484072 +0100
+--- a/arch/mips/include/asm/mach-ralink/mt7620.h
++++ b/arch/mips/include/asm/mach-ralink/mt7620.h

 @@ -59,7 +59,6 @@
  #define MT7620_DDR2_SIZE_MIN          32
  #define MT7620_DDR2_SIZE_MAX          256
 @@ -59,7 +59,6 @@
  #define MT7620_DDR2_SIZE_MIN          32
  #define MT7620_DDR2_SIZE_MAX          256


@@ -1060,10 +1042,8 @@ Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/mt7620.h
 +#define MT7620_GPIO_MODE_PA           20
  
  #endif
 +#define MT7620_GPIO_MODE_PA           20
  
  #endif

-Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/rt3883.h
-===================================================================
---- linux-3.10.17.orig/arch/mips/include/asm/mach-ralink/rt3883.h      2013-10-18 19:44:19.000000000 +0200
-+++ linux-3.10.17/arch/mips/include/asm/mach-ralink/rt3883.h   2013-10-26 17:19:49.934708931 +0200
+--- a/arch/mips/include/asm/mach-ralink/rt3883.h
++++ b/arch/mips/include/asm/mach-ralink/rt3883.h

 @@ -112,8 +112,6 @@
  #define RT3883_CLKCFG1_PCI_CLK_EN     BIT(19)
  #define RT3883_CLKCFG1_UPHY0_CLK_EN   BIT(18)
 @@ -112,8 +112,6 @@
  #define RT3883_CLKCFG1_PCI_CLK_EN     BIT(19)
  #define RT3883_CLKCFG1_UPHY0_CLK_EN   BIT(18)


@@ -1094,10 +1074,8 @@ Index: linux-3.10.17/arch/mips/include/asm/mach-ralink/rt3883.h
  #define RT3883_GPIO_MODE_PCI_SHIFT    11
  #define RT3883_GPIO_MODE_PCI_MASK     0x7
  #define RT3883_GPIO_MODE_PCI          (RT3883_GPIO_MODE_PCI_MASK << RT3883_GPIO_MODE_PCI_SHIFT)
  #define RT3883_GPIO_MODE_PCI_SHIFT    11
  #define RT3883_GPIO_MODE_PCI_MASK     0x7
  #define RT3883_GPIO_MODE_PCI          (RT3883_GPIO_MODE_PCI_MASK << RT3883_GPIO_MODE_PCI_SHIFT)

-Index: linux-3.10.17/arch/mips/ralink/common.h
-===================================================================
---- linux-3.10.17.orig/arch/mips/ralink/common.h       2013-10-26 17:19:49.094708911 +0200
-+++ linux-3.10.17/arch/mips/ralink/common.h    2013-10-26 17:19:49.934708931 +0200
+--- a/arch/mips/ralink/common.h
++++ b/arch/mips/ralink/common.h

 @@ -11,25 +11,6 @@
  
  #define RAMIPS_SYS_TYPE_LEN   32
 @@ -11,25 +11,6 @@
  
  #define RAMIPS_SYS_TYPE_LEN   32


@@ -1124,10 +1102,8 @@ Index: linux-3.10.17/arch/mips/ralink/common.h
  struct ralink_soc_info {
        unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
        unsigned char *compatible;
  struct ralink_soc_info {
        unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
        unsigned char *compatible;

-Index: linux-3.10.17/arch/mips/ralink/rt3883.c
-===================================================================
---- linux-3.10.17.orig/arch/mips/ralink/rt3883.c       2013-10-18 19:44:19.000000000 +0200
-+++ linux-3.10.17/arch/mips/ralink/rt3883.c    2013-10-27 16:23:36.824756002 +0100
+--- a/arch/mips/ralink/rt3883.c
++++ b/arch/mips/ralink/rt3883.c

 @@ -17,132 +17,50 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
 @@ -17,132 +17,50 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>


@@ -1299,7 +1275,7 @@ Index: linux-3.10.17/arch/mips/ralink/rt3883.c
  };
  
  static void rt3883_wdt_reset(void)
  };
  
  static void rt3883_wdt_reset(void)

-@@ -155,17 +73,6 @@
+@@ -155,17 +73,6 @@ static void rt3883_wdt_reset(void)

        rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
  }
  
        rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
  }
  


@@ -1317,7 +1293,7 @@ Index: linux-3.10.17/arch/mips/ralink/rt3883.c
  void __init ralink_clk_init(void)
  {
        unsigned long cpu_rate, sys_rate;
  void __init ralink_clk_init(void)
  {
        unsigned long cpu_rate, sys_rate;

-@@ -243,4 +150,6 @@
+@@ -243,4 +150,6 @@ void prom_soc_init(struct ralink_soc_inf

        soc_info->mem_base = RT3883_SDRAM_BASE;
        soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
        soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;
        soc_info->mem_base = RT3883_SDRAM_BASE;
        soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
        soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;

diff --git a/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch b/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch
index b03263c62cb9318eae7015721436a1d1c020490f..9c5a7289957b7cff6fba2251fee66b01df8ebc90 100644 (file)
--- a/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch
+++ b/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c

-@@ -806,10 +806,6 @@ static void split_uimage(struct mtd_info
+@@ -805,10 +805,6 @@ static void split_uimage(struct mtd_info

                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;
                return;
  
        len = be32_to_cpu(hdr.size) + 0x40;

diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 12eb9b3255af5cf586a04bc690d8a785ed32aae0..8a6a281f45da4d7e1807ef2709072f961234c4e0 100644 (file)
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -11,7 +11,7 @@ BOARD:=rb532
 BOARDNAME:=Mikrotik RouterBoard 532
 FEATURES:=pci targz broken
 
 BOARDNAME:=Mikrotik RouterBoard 532
 FEATURES:=pci targz broken
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
 
 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 eb3ab539ec1f82f922d896a58210f17db1859872..0524144f3922d89ad105adfda360c44df22e45b0 100644 (file)
--- 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>
 
 CPU_SUBTYPE:=vfp
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 DEVICE_TYPE:=developerboard
 
 
 DEVICE_TYPE:=developerboard
 

diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
index bff78e5ee682560d42d316674084c29e26aee7df..e60f55036034df2dda9a723ac0e3b5c2600583d9 100644 (file)
--- a/target/linux/sunxi/Makefile
+++ b/target/linux/sunxi/Makefile
@@ -13,7 +13,7 @@ FEATURES:=targz
 SUBTARGETS=cortex-a7 cortex-a8
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 SUBTARGETS=cortex-a7 cortex-a8
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index df046fb3e63648b4adf39b863af462ab4ec1b4f3..028874b1460747eee6336983431d1f1903fed6c8 100644 (file)
--- 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
                        kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
                        kmod-ledtrig-netdev \
                        kmod-cpu-msr hwclock wpad

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 CS5535_MASK:=0x0b000042
 
 CPU_TYPE := geode
 CS5535_MASK:=0x0b000042
 
 CPU_TYPE := geode

diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index d95c0dc150614828656c73f67c0c408f9867ef12..348779d48f8e0a64c4df99ae350aeaeba07f9b63 100644 (file)
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,6 +1,6 @@
 BOARDNAME:=Generic
 
 BOARDNAME:=Generic
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 define Target/Description
        Build firmware images for x86 based boards
 
 define Target/Description
        Build firmware images for x86 based boards

diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile
index 4f89fd54027a1c6987597ce58f7c4cf35f0817e0..351ca74ef34743ce0423caf9086dd2633ab215ef 100644 (file)
--- 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
 
 FEATURES:=targz ubifs audio
 SUBTARGETS:=qi_lb60 n516 n526 id800wt
 

-LINUX_VERSION:=3.10.17
+LINUX_VERSION:=3.10.18

 
 DEVICE_TYPE=other
 
 
 DEVICE_TYPE=other