aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorStijn Segers <foss@volatilesystems.org>2018-06-29 22:29:06 +0200
committerJohn Crispin <john@phrozen.org>2018-07-02 07:06:23 +0200
commitab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch)
tree791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/ipq40xx
parentc96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff)
downloadupstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz
upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2
upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64. Run-tested on: ramips/mt7621. Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch7
-rw-r--r--target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch4
2 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch b/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch
index 82766c1f2c..8c70fceb01 100644
--- a/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch
+++ b/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch
@@ -8,11 +8,9 @@ Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
drivers/net/ethernet/qualcomm/essedma/edma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c
-index a3c0d66..29bc9f8 100644
--- a/drivers/net/ethernet/qualcomm/essedma/edma.c
+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
-@@ -193,7 +193,7 @@ static int edma_alloc_rx_buf(struct edma_common_info
+@@ -201,7 +201,7 @@ static int edma_alloc_rx_buf(struct edma
skb = sw_desc->skb;
} else {
/* alloc skb */
@@ -21,6 +19,3 @@ index a3c0d66..29bc9f8 100644
if (!skb) {
/* Better luck next round */
break;
---
-2.17.1
-
diff --git a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
index 51a35c17d9..8b5e64a2d4 100644
--- a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
+++ b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
@@ -1,12 +1,12 @@
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
-@@ -1127,6 +1127,9 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1130,6 +1130,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
+ p = of_get_flat_dt_prop(node, "bootargs-append", &l);
+ if (p != NULL && l > 0)
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
-
+
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else