aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-01-25 17:29:41 +0000
committerLuka Perkov <luka@openwrt.org>2015-01-25 17:29:41 +0000
commitee3eade28597b7fe4157c55b816af69a94ca4d0a (patch)
tree9114f91c9f960eacee4cab43bc85c0cf23c0bde1 /target/linux/generic
parent6fbf35501e410aef676e14a0ce19942fc7f58940 (diff)
downloadupstream-ee3eade28597b7fe4157c55b816af69a94ca4d0a.tar.gz
upstream-ee3eade28597b7fe4157c55b816af69a94ca4d0a.tar.bz2
upstream-ee3eade28597b7fe4157c55b816af69a94ca4d0a.zip
kernel: update 3.14 to 3.14.29
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44137
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch4
-rw-r--r--target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch2
-rw-r--r--target/linux/generic/patches-3.14/997-device_tree_cmdline.patch16
3 files changed, 9 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
index e8486c9a47..bd835f9c9f 100644
--- a/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
@@ -510,7 +510,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
-@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device
+@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device
}
EXPORT_SYMBOL(dma_free_noncoherent);
@@ -650,7 +650,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
-@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev,
+@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev,
EXPORT_SYMBOL(dma_cache_sync);
diff --git a/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
index 4b4ac951a1..b4c4761ec4 100644
--- a/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -852,9 +852,6 @@ config FW_ARC
+@@ -853,9 +853,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
diff --git a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
index 9a52e1542b..053c425f66 100644
--- a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
@@ -1,8 +1,6 @@
-Index: linux-3.14.28/drivers/of/fdt.c
-===================================================================
---- linux-3.14.28.orig/drivers/of/fdt.c 2015-01-08 10:01:03.000000000 -0800
-+++ linux-3.14.28/drivers/of/fdt.c 2015-01-17 20:29:51.674740290 -0800
-@@ -817,6 +817,9 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -817,6 +817,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));
@@ -12,11 +10,9 @@ Index: linux-3.14.28/drivers/of/fdt.c
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else
-Index: linux-3.14.28/arch/mips/kernel/prom.c
-===================================================================
---- linux-3.14.28.orig/arch/mips/kernel/prom.c 2015-01-17 20:30:09.922830766 -0800
-+++ linux-3.14.28/arch/mips/kernel/prom.c 2015-01-17 20:30:54.095049815 -0800
-@@ -49,6 +49,9 @@
+--- a/arch/mips/kernel/prom.c
++++ b/arch/mips/kernel/prom.c
+@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
void __init __dt_setup_arch(struct boot_param_header *bph)
{