Changeset 46301


Ignore:
Timestamp:
2015-07-11T21:59:26+02:00 (3 years ago)
Author:
hauke
Message:

kernel: update 4.1 to 4.1.2

Changelog:

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk
Files:
5 edited

Legend:

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

    r46300 r46301  
    55LINUX_VERSION-3.18 = .18 
    66LINUX_VERSION-4.0 = .8 
    7 LINUX_VERSION-4.1 = .1 
     7LINUX_VERSION-4.1 = .2 
    88 
    99LINUX_KERNEL_MD5SUM-3.18.18 = 6fce868a56f2d83f80cdad5fed457110 
    1010LINUX_KERNEL_MD5SUM-4.0.8 = a99375dd855de00635e9ac8e62b0f8e6 
    11 LINUX_KERNEL_MD5SUM-4.1.1 = bf83da42349ab7fe77c61b5d10d9f003 
     11LINUX_KERNEL_MD5SUM-4.1.2 = 26879db288cd9ffa17c9fd5db213b272 
    1212 
    1313ifdef KERNEL_PATCHVER 
  • trunk/target/linux/generic/patches-4.1/091-mtd-spi-nor-add-support-Spansion_S25FL164K

    r46237 r46301  
    1 Index: linux-4.1.1/drivers/mtd/spi-nor/spi-nor.c 
    2 =================================================================== 
    3 --- linux-4.1.1.orig/drivers/mtd/spi-nor/spi-nor.c 
    4 +++ linux-4.1.1/drivers/mtd/spi-nor/spi-nor.c 
    5 @@ -618,6 +618,7 @@ static const struct spi_device_id spi_no 
     1--- a/drivers/mtd/spi-nor/spi-nor.c 
     2+++ b/drivers/mtd/spi-nor/spi-nor.c 
     3@@ -614,6 +614,7 @@ static const struct spi_device_id spi_no 
    64        { "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) }, 
    75        { "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) }, 
  • trunk/target/linux/generic/patches-4.1/630-packet_socket_type.patch

    r46112 r46301  
    2727--- a/net/packet/af_packet.c 
    2828+++ b/net/packet/af_packet.c 
    29 @@ -1547,6 +1547,7 @@ static int packet_rcv_spkt(struct sk_buf 
     29@@ -1533,6 +1533,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3030 { 
    3131        struct sock *sk; 
     
    3535        /* 
    3636         *      When we registered the protocol we saved the socket in the data 
    37 @@ -1554,6 +1555,7 @@ static int packet_rcv_spkt(struct sk_buf 
     37@@ -1540,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3838         */ 
    3939  
     
    4343        /* 
    4444         *      Yank back the headers [hope the device set this 
    45 @@ -1566,7 +1568,7 @@ static int packet_rcv_spkt(struct sk_buf 
     45@@ -1552,7 +1554,7 @@ static int packet_rcv_spkt(struct sk_buf 
    4646         *      so that this procedure is noop. 
    4747         */ 
     
    5252  
    5353        if (!net_eq(dev_net(dev), sock_net(sk))) 
    54 @@ -1773,12 +1775,12 @@ static int packet_rcv(struct sk_buff *sk 
     54@@ -1759,12 +1761,12 @@ static int packet_rcv(struct sk_buff *sk 
    5555        int skb_len = skb->len; 
    5656        unsigned int snaplen, res; 
     
    6868                goto drop; 
    6969  
    70 @@ -1898,12 +1900,12 @@ static int tpacket_rcv(struct sk_buff *s 
     70@@ -1884,12 +1886,12 @@ static int tpacket_rcv(struct sk_buff *s 
    7171        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); 
    7272        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); 
     
    8484                goto drop; 
    8585  
    86 @@ -2866,6 +2868,7 @@ static int packet_create(struct net *net 
     86@@ -2852,6 +2854,7 @@ static int packet_create(struct net *net 
    8787        spin_lock_init(&po->bind_lock); 
    8888        mutex_init(&po->pg_vec_lock); 
     
    9292        if (sock->type == SOCK_PACKET) 
    9393                po->prot_hook.func = packet_rcv_spkt; 
    94 @@ -3471,6 +3474,16 @@ packet_setsockopt(struct socket *sock, i 
     94@@ -3457,6 +3460,16 @@ packet_setsockopt(struct socket *sock, i 
    9595                po->xmit = val ? packet_direct_xmit : dev_queue_xmit; 
    9696                return 0; 
     
    109109                return -ENOPROTOOPT; 
    110110        } 
    111 @@ -3522,6 +3535,13 @@ static int packet_getsockopt(struct sock 
     111@@ -3508,6 +3521,13 @@ static int packet_getsockopt(struct sock 
    112112        case PACKET_VNET_HDR: 
    113113                val = po->has_vnet_hdr; 
  • trunk/target/linux/generic/patches-4.1/702-phy_add_aneg_done_function.patch

    r46112 r46301  
    1616--- a/drivers/net/phy/phy_device.c 
    1717+++ b/drivers/net/phy/phy_device.c 
    18 @@ -928,6 +928,9 @@ int genphy_update_link(struct phy_device 
     18@@ -929,6 +929,9 @@ int genphy_update_link(struct phy_device 
    1919 { 
    2020        int status; 
  • trunk/target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch

    r46112 r46301  
    11--- a/drivers/net/phy/phy_device.c 
    22+++ b/drivers/net/phy/phy_device.c 
    3 @@ -1146,7 +1146,7 @@ int genphy_config_init(struct phy_device 
     3@@ -1147,7 +1147,7 @@ int genphy_config_init(struct phy_device 
    44        return 0; 
    55 } 
     
    1010        /* Do nothing for now */ 
    1111        return 0; 
    12 @@ -1360,7 +1360,7 @@ static struct phy_driver genphy_driver[] 
     12@@ -1361,7 +1361,7 @@ static struct phy_driver genphy_driver[] 
    1313        .phy_id         = 0xffffffff, 
    1414        .phy_id_mask    = 0xffffffff, 
     
    1919        .features       = PHY_GBIT_FEATURES | SUPPORTED_MII | 
    2020                          SUPPORTED_AUI | SUPPORTED_FIBRE | 
    21 @@ -1375,7 +1375,7 @@ static struct phy_driver genphy_driver[] 
     21@@ -1376,7 +1376,7 @@ static struct phy_driver genphy_driver[] 
    2222        .phy_id         = 0xffffffff, 
    2323        .phy_id_mask    = 0xffffffff, 
Note: See TracChangeset for help on using the changeset viewer.