Changeset 49096

Timestamp:

2016-03-30T18:41:26+02:00 (22 months ago)

Author:

rmilecki

Message:

kernel: update kernel 3.18 to version 3.18.29

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:

trunk

Files:

• include/kernel-version.mk (modified) (1 diff)
• target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch (modified) (4 diffs)
• target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch (modified) (2 diffs)
• target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch (modified) (1 diff)
• target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch (modified) (1 diff)

trunk/include/kernel-version.mk

@@ -3 +3 @@
 LINUX_RELEASE?=1
 
-LINUX_VERSION-3.18 = .27
+LINUX_VERSION-3.18 = .29
 LINUX_VERSION-4.1 = .20
 LINUX_VERSION-4.3 = .4
 LINUX_VERSION-4.4 = .6
 
-LINUX_KERNEL_MD5SUM-3.18.27 = 015a01bf84e7c6bc9952551b4da45044
+LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28
 LINUX_KERNEL_MD5SUM-4.1.20 = 075c38a3a23ca5bc80437b13606df00a
 LINUX_KERNEL_MD5SUM-4.3.4 = 5275d02132107c28b85f986bad576d91

trunk/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch

@@ -45 +45 @@
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c
-@@ -594,20 +594,22 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -597,20 +597,22 @@ int ip6_fragment(struct sk_buff *skb, in
         }
         mtu -= hlen + sizeof(struct frag_hdr);
@@ -70 +70 @@
  
                         /* Partially cloned skb? */
-@@ -624,8 +626,6 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -627,8 +629,6 @@ int ip6_fragment(struct sk_buff *skb, in
  
                 err = 0;
@@ -79 +79 @@
  
                 *prevhdr = NEXTHDR_FRAGMENT;
-@@ -633,8 +633,11 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -636,8 +636,11 @@ int ip6_fragment(struct sk_buff *skb, in
                 if (!tmp_hdr) {
                         IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
@@ -92 +92 @@
                 __skb_pull(skb, hlen);
                 fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct frag_hdr));
-@@ -732,7 +735,6 @@ slow_path:
+@@ -735,7 +738,6 @@ slow_path:
          */
  

trunk/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch

@@ -62 +62 @@
  enum qcserial_layouts {
         QCSERIAL_G2K = 0,       /* Gobi 2000 */
-@@ -166,6 +168,38 @@ static const struct usb_device_id id_tab
+@@ -171,6 +173,38 @@ static const struct usb_device_id id_tab
  };
  MODULE_DEVICE_TABLE(usb, id_table);
@@ -101 +101 @@
  {
         struct usb_host_interface *intf = serial->interface->cur_altsetting;
-@@ -234,6 +268,11 @@ static int qcprobe(struct usb_serial *se
+@@ -239,6 +273,11 @@ static int qcprobe(struct usb_serial *se
                         altsetting = -1;
                 break;

trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch

@@ -1 +1 @@
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
-@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+@@ -116,6 +116,16 @@ static int jffs2_build_filesystem(struct
         dbg_fsbuild("scanned flash completely\n");
         jffs2_dbg_dump_block_lists_nolock(c);

trunk/target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch

@@ -27 +27 @@
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c
-@@ -900,21 +900,45 @@ static int ip6_dst_lookup_tail(struct so
+@@ -903,21 +903,45 @@ static int ip6_dst_lookup_tail(struct so
  #endif
         int err;