Changeset 38000


Ignore:
Timestamp:
2013-09-15T18:00:41+02:00 (4 years ago)
Author:
juhosg
Message:

kernel: update 3.10 to 3.10.12

Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk
Files:
1 deleted
38 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r37890 r38000  
    1818  LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 
    1919endif 
    20 ifeq ($(LINUX_VERSION),3.10.10) 
    21   LINUX_KERNEL_MD5SUM:=647f76225dd6bc112369ba573ba3de18 
     20ifeq ($(LINUX_VERSION),3.10.12) 
     21  LINUX_KERNEL_MD5SUM:=16e43b3c9957cf5af44863d6809efe38 
    2222endif 
    2323 
  • trunk/target/linux/ar71xx/Makefile

    r37890 r38000  
    1414SUBTARGETS:=generic nand 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ar71xx/patches-3.10/404-mtd-wrt160nl-trx-parser.patch

    r37349 r38000  
    11--- a/drivers/mtd/Kconfig 
    22+++ b/drivers/mtd/Kconfig 
    3 @@ -172,6 +172,12 @@ config MTD_BCM47XX_PARTS 
     3@@ -176,6 +176,12 @@ config MTD_BCM47XX_PARTS 
    44          This provides partitions parser for devices based on BCM47xx 
    55          boards. 
  • trunk/target/linux/ar71xx/patches-3.10/405-mtd-tp-link-partition-parser.patch

    r37349 r38000  
    11--- a/drivers/mtd/Kconfig 
    22+++ b/drivers/mtd/Kconfig 
    3 @@ -174,7 +174,7 @@ config MTD_BCM47XX_PARTS 
     3@@ -178,7 +178,7 @@ config MTD_BCM47XX_PARTS 
    44  
    55 config MTD_WRT160NL_PARTS 
     
    1010           Linksys WRT160NL partitioning support 
    1111  
    12 @@ -194,6 +194,12 @@ config MTD_MYLOADER_PARTS 
     12@@ -198,6 +198,12 @@ config MTD_MYLOADER_PARTS 
    1313          You will still need the parsing functions to be called by the driver 
    1414          for your particular device. It won't happen automatically. 
  • trunk/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch

    r37502 r38000  
    884884--- a/net/ipv4/tcp_input.c 
    885885+++ b/net/ipv4/tcp_input.c 
    886 @@ -3592,13 +3592,14 @@ static bool tcp_parse_aligned_timestamp( 
     886@@ -3592,14 +3592,16 @@ static bool tcp_parse_aligned_timestamp( 
    887887 { 
    888888        const __be32 *ptr = (const __be32 *)(th + 1); 
     
    898898+               tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr); 
    899899                ++ptr; 
    900 -               tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset; 
    901 +               tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) - tp->tsoffset; 
     900                if (*ptr) 
     901-                       tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset; 
     902+                       tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) - 
     903+                                              tp->tsoffset; 
     904                else 
     905                        tp->rx_opt.rcv_tsecr = 0; 
    902906                return true; 
    903         } 
    904         return false; 
    905907--- a/include/uapi/linux/if_pppox.h 
    906908+++ b/include/uapi/linux/if_pppox.h 
  • trunk/target/linux/bcm53xx/Makefile

    r37890 r38000  
    1313MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> 
    1414 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm2708/Makefile

    r37890 r38000  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch

    r37832 r38000  
    20802080--- a/arch/arm/kernel/fiq.c 
    20812081+++ b/arch/arm/kernel/fiq.c 
    2082 @@ -145,6 +145,7 @@ void disable_fiq(int fiq) 
     2082@@ -141,6 +141,7 @@ void disable_fiq(int fiq) 
    20832083 EXPORT_SYMBOL(set_fiq_handler); 
    20842084 EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ 
  • trunk/target/linux/brcm47xx/Makefile

    r37959 r38000  
    1313MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> 
    1414 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch

    r37986 r38000  
    121121        } 
    122122 } 
    123 @@ -3985,7 +3992,7 @@ static int tg3_power_down_prepare(struct 
     123@@ -3999,7 +4006,7 @@ static int tg3_power_down_prepare(struct 
    124124                        struct phy_device *phydev; 
    125125                        u32 phyid, advertising; 
     
    130130                        tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER; 
    131131  
    132 @@ -11769,7 +11776,7 @@ static int tg3_get_settings(struct net_d 
     132@@ -11783,7 +11790,7 @@ static int tg3_get_settings(struct net_d 
    133133                struct phy_device *phydev; 
    134134                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) 
     
    139139        } 
    140140  
    141 @@ -11836,7 +11843,7 @@ static int tg3_set_settings(struct net_d 
     141@@ -11850,7 +11857,7 @@ static int tg3_set_settings(struct net_d 
    142142                struct phy_device *phydev; 
    143143                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) 
     
    148148        } 
    149149  
    150 @@ -11993,7 +12000,7 @@ static int tg3_nway_reset(struct net_dev 
     150@@ -12007,7 +12014,7 @@ static int tg3_nway_reset(struct net_dev 
    151151        if (tg3_flag(tp, USE_PHYLIB)) { 
    152152                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) 
     
    157157                u32 bmcr; 
    158158  
    159 @@ -12109,7 +12116,7 @@ static int tg3_set_pauseparam(struct net 
     159@@ -12123,7 +12130,7 @@ static int tg3_set_pauseparam(struct net 
    160160                u32 newadv; 
    161161                struct phy_device *phydev; 
     
    166166                if (!(phydev->supported & SUPPORTED_Pause) || 
    167167                    (!(phydev->supported & SUPPORTED_Asym_Pause) && 
    168 @@ -13543,7 +13550,7 @@ static int tg3_ioctl(struct net_device * 
     168@@ -13557,7 +13564,7 @@ static int tg3_ioctl(struct net_device * 
    169169                struct phy_device *phydev; 
    170170                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) 
     
    175175        } 
    176176  
    177 @@ -17176,8 +17183,10 @@ static int tg3_init_one(struct pci_dev * 
     177@@ -17190,8 +17197,10 @@ static int tg3_init_one(struct pci_dev * 
    178178                        tg3_flag_set(tp, FLUSH_POSTED_WRITES); 
    179179                if (ssb_gige_one_dma_at_once(pdev)) 
     
    187187                        tg3_flag_set(tp, RGMII_MODE); 
    188188        } 
    189 @@ -17447,7 +17456,7 @@ static int tg3_init_one(struct pci_dev * 
     189@@ -17461,7 +17470,7 @@ static int tg3_init_one(struct pci_dev * 
    190190  
    191191        if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) { 
  • trunk/target/linux/brcm63xx/Makefile

    r37910 r38000  
    1212SUBTARGETS:=generic smp 
    1313FEATURES:=squashfs usb atm pci pcmcia 
    14 LINUX_VERSION:=3.10.10 
     14LINUX_VERSION:=3.10.12 
    1515MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1616 
  • trunk/target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch

    r37832 r38000  
    1212--- a/drivers/mtd/devices/m25p80.c 
    1313+++ b/drivers/mtd/devices/m25p80.c 
    14 @@ -1088,7 +1088,8 @@ static int m25p_probe(struct spi_device 
     14@@ -1091,7 +1091,8 @@ static int m25p_probe(struct spi_device 
    1515        /* partitions should match sector boundaries; and it may be good to 
    1616         * use readonly partitions for writeprotected sectors (BP2..BP0). 
  • trunk/target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch

    r37832 r38000  
    6161  * Write an address range to the flash chip.  Data must be written in 
    6262  * FLASH_PAGESIZE chunks.  The address range may be any size provided 
    63 @@ -983,6 +1005,9 @@ static int m25p_probe(struct spi_device 
     63@@ -986,6 +1008,9 @@ static int m25p_probe(struct spi_device 
    6464                return -ENOMEM; 
    6565        } 
  • trunk/target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch

    r37832 r38000  
    1111--- a/drivers/mtd/devices/m25p80.c 
    1212+++ b/drivers/mtd/devices/m25p80.c 
    13 @@ -972,6 +972,9 @@ static int m25p_probe(struct spi_device 
     13@@ -975,6 +975,9 @@ static int m25p_probe(struct spi_device 
    1414                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type); 
    1515        } 
  • trunk/target/linux/cns21xx/Makefile

    r37972 r38000  
    1313CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 
    1414 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/generic/patches-3.10/259-regmap_dynamic.patch

    r37832 r38000  
    3232--- a/include/linux/regmap.h 
    3333+++ b/include/linux/regmap.h 
    34 @@ -46,7 +46,7 @@ struct reg_default { 
     34@@ -47,7 +47,7 @@ struct reg_default { 
    3535        unsigned int def; 
    3636 }; 
  • trunk/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch

    r37974 r38000  
    1010 static LIST_HEAD(mtd_partitions); 
    1111 static DEFINE_MUTEX(mtd_partitions_mutex); 
    12 @@ -232,13 +234,60 @@ static int part_erase(struct mtd_info *m 
     12@@ -231,13 +233,60 @@ static int part_erase(struct mtd_info *m 
    1313        struct mtd_part *part = PART(mtd); 
    1414        int ret; 
     
    7171 } 
    7272  
    73 @@ -246,7 +295,25 @@ void mtd_erase_callback(struct erase_inf 
     73@@ -245,7 +294,25 @@ void mtd_erase_callback(struct erase_inf 
    7474 { 
    7575        if (instr->mtd->_erase == part_erase) { 
     
    9797                        instr->fail_addr -= part->offset; 
    9898                instr->addr -= part->offset; 
    99 @@ -506,18 +573,24 @@ static struct mtd_part *allocate_partiti 
     99@@ -505,18 +572,24 @@ static struct mtd_part *allocate_partiti 
    100100        if ((slave->mtd.flags & MTD_WRITEABLE) && 
    101101            mtd_mod_by_eb(slave->offset, &slave->mtd)) { 
  • trunk/target/linux/generic/patches-3.10/412-mtd-partial_eraseblock_unlock.patch

    r37974 r38000  
    11--- a/drivers/mtd/mtdpart.c 
    22+++ b/drivers/mtd/mtdpart.c 
    3 @@ -332,7 +332,14 @@ static int part_lock(struct mtd_info *mt 
     3@@ -331,7 +331,14 @@ static int part_lock(struct mtd_info *mt 
    44 static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) 
    55 { 
  • trunk/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch

    r37974 r38000  
    11--- a/drivers/mtd/Kconfig 
    22+++ b/drivers/mtd/Kconfig 
    3 @@ -172,6 +172,22 @@ config MTD_BCM47XX_PARTS 
     3@@ -176,6 +176,22 @@ config MTD_BCM47XX_PARTS 
    44          This provides partitions parser for devices based on BCM47xx 
    55          boards. 
  • trunk/target/linux/generic/patches-3.10/620-sched_esfq.patch

    r36663 r38000  
    11--- a/include/uapi/linux/pkt_sched.h 
    22+++ b/include/uapi/linux/pkt_sched.h 
    3 @@ -214,6 +214,33 @@ struct tc_sfq_xstats { 
     3@@ -222,6 +222,33 @@ struct tc_sfq_xstats { 
    44        __s32           allot; 
    55 }; 
  • trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch

    r37116 r38000  
    109109                return -ENOPROTOOPT; 
    110110        } 
    111 @@ -3275,6 +3288,13 @@ static int packet_getsockopt(struct sock 
     111@@ -3277,6 +3290,13 @@ static int packet_getsockopt(struct sock 
    112112        case PACKET_VNET_HDR: 
    113113                val = po->has_vnet_hdr; 
  • trunk/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch

    r37832 r38000  
    3333--- a/net/ipv6/addrconf.c 
    3434+++ b/net/ipv6/addrconf.c 
    35 @@ -1321,7 +1321,7 @@ out: 
     35@@ -1319,7 +1319,7 @@ out: 
    3636        return ret; 
    3737 } 
     
    4242                       struct in6_addr *saddr) 
    4343 { 
    44 @@ -1446,7 +1446,6 @@ try_nextdev: 
     44@@ -1444,7 +1444,6 @@ try_nextdev: 
    4545        in6_ifa_put(hiscore->ifa); 
    4646        return 0; 
     
    5050 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, 
    5151                      unsigned char banned_flags) 
    52 @@ -5145,6 +5144,9 @@ int __init addrconf_init(void) 
     52@@ -5143,6 +5142,9 @@ int __init addrconf_init(void) 
    5353  
    5454        ipv6_addr_label_rtnl_register(); 
     
    6060 errout: 
    6161        rtnl_af_unregister(&inet6_ops); 
    62 @@ -5163,6 +5165,9 @@ void addrconf_cleanup(void) 
     62@@ -5161,6 +5163,9 @@ void addrconf_cleanup(void) 
    6363        struct net_device *dev; 
    6464        int i; 
  • trunk/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

    r37832 r38000  
    2222 }; 
    2323  
    24 --- a/include/uapi/linux/icmpv6.h 
    25 +++ b/include/uapi/linux/icmpv6.h 
    26 @@ -115,6 +115,7 @@ struct icmp6hdr { 
    27  #define ICMPV6_NOT_NEIGHBOUR           2 
    28  #define ICMPV6_ADDR_UNREACH            3 
    29  #define ICMPV6_PORT_UNREACH            4 
    30 +#define ICMPV6_FAILED_POLICY           5 
    31   
    32  /* 
    33   *     Codes for Time Exceeded 
    3424--- a/include/uapi/linux/rtnetlink.h 
    3525+++ b/include/uapi/linux/rtnetlink.h 
     
    7060--- a/net/ipv4/fib_trie.c 
    7161+++ b/net/ipv4/fib_trie.c 
    72 @@ -2334,6 +2334,7 @@ static const char *const rtn_type_names[ 
     62@@ -2331,6 +2331,7 @@ static const char *const rtn_type_names[ 
    7363        [RTN_THROW] = "THROW", 
    7464        [RTN_NAT] = "NAT", 
     
    154144+static int ip6_pkt_failed_policy(struct sk_buff *skb) 
    155145+{ 
    156 +       return ip6_pkt_drop(skb, ICMPV6_FAILED_POLICY, IPSTATS_MIB_INNOROUTES); 
     146+       return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES); 
    157147+} 
    158148+ 
     
    160150+{ 
    161151+       skb->dev = skb_dst(skb)->dev; 
    162 +       return ip6_pkt_drop(skb, ICMPV6_FAILED_POLICY, IPSTATS_MIB_OUTNOROUTES); 
     152+       return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES); 
    163153+} 
    164154+ 
  • trunk/target/linux/generic/patches-3.10/902-debloat_proc.patch

    r37832 r38000  
    112112--- a/kernel/time/timer_list.c 
    113113+++ b/kernel/time/timer_list.c 
    114 @@ -357,6 +357,8 @@ static int __init init_timer_list_procfs 
     114@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs 
    115115 { 
    116116        struct proc_dir_entry *pe; 
     
    185185--- a/net/ipv4/fib_trie.c 
    186186+++ b/net/ipv4/fib_trie.c 
    187 @@ -2590,10 +2590,12 @@ static const struct file_operations fib_ 
     187@@ -2587,10 +2587,12 @@ static const struct file_operations fib_ 
    188188  
    189189 int __net_init fib_proc_init(struct net *net) 
     
    200200                goto out2; 
    201201  
    202 @@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net 
     202@@ -2600,17 +2602,21 @@ int __net_init fib_proc_init(struct net 
    203203        return 0; 
    204204  
  • trunk/target/linux/imx23/Makefile

    r37890 r38000  
    1313CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s 
    1414MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616KERNELNAME:="zImage dtbs" 
    1717 
  • trunk/target/linux/imx6/Makefile

    r37890 r38000  
    1414MAINTAINER:=Luka Perkov <luka@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/imx6/patches-3.10/200-imx6_pcie.patch

    r37502 r38000  
    11--- a/arch/arm/boot/dts/imx6q.dtsi 
    22+++ b/arch/arm/boot/dts/imx6q.dtsi 
    3 @@ -382,6 +382,15 @@ 
    4                         }; 
     3@@ -391,6 +391,15 @@ 
     4                        status = "disabled"; 
    55                }; 
    66  
  • trunk/target/linux/ixp4xx/Makefile

    r37890 r38000  
    1414SUBTARGETS=generic harddisk 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/malta/Makefile

    r37890 r38000  
    1313MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616 
    1717DEVICE_TYPE:=developerboard 
  • trunk/target/linux/mpc85xx/Makefile

    r37890 r38000  
    1515SUBTARGETS=generic p1020 
    1616 
    17 LINUX_VERSION:=3.10.10 
     17LINUX_VERSION:=3.10.12 
    1818 
    1919include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/octeon/Makefile

    r37890 r38000  
    1414MAINTAINER:=John Crispin <blogic@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ppc40x/Makefile

    r37913 r38000  
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ramips/Makefile

    r37890 r38000  
    1414FEATURES:=squashfs gpio 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch

    r37832 r38000  
    1515--- a/drivers/mtd/devices/m25p80.c 
    1616+++ b/drivers/mtd/devices/m25p80.c 
    17 @@ -922,10 +922,13 @@ static int m25p_probe(struct spi_device 
     17@@ -925,10 +925,13 @@ static int m25p_probe(struct spi_device 
    1818        unsigned                        i; 
    1919        struct mtd_part_parser_data     ppdata; 
     
    2929  
    3030        /* Platform data helps sort out which chip type we have, as 
    31 @@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device 
     31@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device 
    3232  
    3333        if (data && data->name) 
  • trunk/target/linux/ramips/patches-3.10/0204-owrt-mtd-split-remove-padding.patch

    r37778 r38000  
    11--- a/drivers/mtd/mtdpart.c 
    22+++ b/drivers/mtd/mtdpart.c 
    3 @@ -807,10 +807,6 @@ static void split_uimage(struct mtd_info 
     3@@ -808,10 +808,6 @@ static void split_uimage(struct mtd_info 
    44                return; 
    55  
  • trunk/target/linux/realview/Makefile

    r37890 r38000  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10.10 
     16LINUX_VERSION:=3.10.12 
    1717 
    1818DEVICE_TYPE:=developerboard 
  • trunk/target/linux/x86/alix2/target.mk

    r37890 r38000  
    2020                        kmod-ledtrig-netdev \ 
    2121                        kmod-cpu-msr hwclock wpad 
    22 LINUX_VERSION:=3.10.10 
     22LINUX_VERSION:=3.10.12 
    2323CS5535_MASK:=0x0b000042 
    2424 
  • trunk/target/linux/xburst/Makefile

    r37890 r38000  
    1313SUBTARGETS:=qi_lb60 n516 n526 id800wt 
    1414 
    15 LINUX_VERSION:=3.10.10 
     15LINUX_VERSION:=3.10.12 
    1616 
    1717DEVICE_TYPE=other 
Note: See TracChangeset for help on using the changeset viewer.