aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-05-17 18:41:25 +0200
committerJohn Crispin <john@phrozen.org>2018-05-18 09:10:21 +0200
commit12f44b83a8db2c95274839e2e41792e096021f29 (patch)
tree53fa8c04230702c41cb2a6bcd976e47fb828c8c5 /target/linux/ixp4xx
parent6390f27c2ed6189f6aac2308a2ea40fde2f798d7 (diff)
downloadupstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.gz
upstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.bz2
upstream-12f44b83a8db2c95274839e2e41792e096021f29.zip
kernel: bump 4.9 to 4.9.100
Refreshed all patches Added new ARM64 symbol: ARM64_ERRATUM_1024718 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch2
-rw-r--r--target/linux/ixp4xx/patches-4.9/600-skb_avoid_dmabounce.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch
index 2b4db053c2..9da213911e 100644
--- a/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch
+++ b/target/linux/ixp4xx/patches-4.9/090-increase_entropy_pools.patch
@@ -1,6 +1,6 @@
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
-@@ -278,11 +278,11 @@
+@@ -279,11 +279,11 @@
/*
* Configuration information
*/
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 3f3621b0d0..80688a4c0a 100644
--- 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);
-@@ -1222,6 +1225,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -1223,6 +1226,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb))
BUG();