kernel: bump 4.9 to 4.9.160

Refreshed all patches.

Compile-tested on: ar7
Runtime-tested on: none

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index c20ab6f1b1056e67521d32895a76a4d5eda7446c..b84263992246b1013a54bd84b9658e478c565031 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,12 +3,12 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .136
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .136

-LINUX_VERSION-4.9 = .159
+LINUX_VERSION-4.9 = .160

 LINUX_VERSION-4.14 = .102
 LINUX_VERSION-4.19 = .24
 
 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
 LINUX_VERSION-4.14 = .102
 LINUX_VERSION-4.19 = .24
 
 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c

-LINUX_KERNEL_HASH-4.9.159 = 9f9df13168a090d12314e2e8dac040e71ce3f2ed89eafbece2b14dabb6771742
+LINUX_KERNEL_HASH-4.9.160 = c09af067af62d299f5e33c279968de58c88fb7c59bd05e8f3bb460f611f60515

 LINUX_KERNEL_HASH-4.14.102 = d8a982cfa2804edc2ae9d20792ab0e3897f3976ced5632f2392c2e1918562501
 LINUX_KERNEL_HASH-4.19.24 = 3bb1885fabd874b469a8ea19571c5a4ad5b6faa3cca1662137c57b40fcbf8e04
 
 LINUX_KERNEL_HASH-4.14.102 = d8a982cfa2804edc2ae9d20792ab0e3897f3976ced5632f2392c2e1918562501
 LINUX_KERNEL_HASH-4.19.24 = 3bb1885fabd874b469a8ea19571c5a4ad5b6faa3cca1662137c57b40fcbf8e04
 

diff --git a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
index d1da94b4e68597f66872e84ad244dd5945fccbd5..facc43004e5ebec05d54e0d55923fc55d66e8fa4 100644 (file)
--- a/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
+++ b/target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
@@ -108,7 +108,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        local_irq_restore(flags);
        return data;
  }
        local_irq_restore(flags);
        return data;
  }

-@@ -391,7 +391,7 @@ static void *__napi_alloc_frag(unsigned
+@@ -393,7 +393,7 @@ static void *__napi_alloc_frag(unsigned

  {
        struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  
  {
        struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
  


@@ -117,7 +117,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  }
  
  void *napi_alloc_frag(unsigned int fragsz)
  }
  
  void *napi_alloc_frag(unsigned int fragsz)

-@@ -441,7 +441,7 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -445,7 +445,7 @@ struct sk_buff *__netdev_alloc_skb(struc

        local_irq_save(flags);
  
        nc = this_cpu_ptr(&netdev_alloc_cache);
        local_irq_save(flags);
  
        nc = this_cpu_ptr(&netdev_alloc_cache);


@@ -126,7 +126,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        pfmemalloc = nc->pfmemalloc;
  
        local_irq_restore(flags);
        pfmemalloc = nc->pfmemalloc;
  
        local_irq_restore(flags);

-@@ -505,7 +505,7 @@ struct sk_buff *__napi_alloc_skb(struct
+@@ -509,7 +509,7 @@ struct sk_buff *__napi_alloc_skb(struct

        if (sk_memalloc_socks())
                gfp_mask |= __GFP_MEMALLOC;
  
        if (sk_memalloc_socks())
                gfp_mask |= __GFP_MEMALLOC;
  

diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch
index 9bc5b01776a20874b0811c60b0d8c9a065295a14..d22c8730325f32845cd8f0f1fa1494562cb25650 100644 (file)
--- a/target/linux/generic/hack-4.9/721-phy_packets.patch
+++ b/target/linux/generic/hack-4.9/721-phy_packets.patch
@@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  #include <net/protocol.h>
  #include <net/dst.h>
  
  #include <net/protocol.h>
  #include <net/dst.h>

-@@ -529,6 +530,22 @@ skb_fail:
+@@ -533,6 +534,22 @@ skb_fail:

  }
  EXPORT_SYMBOL(__napi_alloc_skb);
  
  }
  EXPORT_SYMBOL(__napi_alloc_skb);
  

diff --git a/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch b/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch
index 046ec4e8f3af9adf83468a9354bf491e36b3d44e..cdd9fde8f076a419f781af4f48c800f9975083a7 100644 (file)
--- a/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch
@@ -10,7 +10,7 @@
  
        /* Get the HEAD */
        skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
  
        /* Get the HEAD */
        skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);

-@@ -1224,6 +1227,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -1228,6 +1231,10 @@ int pskb_expand_head(struct sk_buff *skb

        if (skb_shared(skb))
                BUG();
  
        if (skb_shared(skb))
                BUG();