kernel: update 3.14 to 3.14.29

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 44137
lede-17.01
Luka Perkov 2015-01-25 17:29:41 +00:00
parent 6fbf35501e
commit ee3eade285
4 changed files with 11 additions and 15 deletions

View File

@ -5,14 +5,14 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.8 = .13 LINUX_VERSION-3.8 = .13
LINUX_VERSION-3.10 = .58 LINUX_VERSION-3.10 = .58
LINUX_VERSION-3.13 = .7 LINUX_VERSION-3.13 = .7
LINUX_VERSION-3.14 = .28 LINUX_VERSION-3.14 = .29
LINUX_VERSION-3.18 = .3 LINUX_VERSION-3.18 = .3
LINUX_VERSION-3.19 = -rc5 LINUX_VERSION-3.19 = -rc5
LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d
LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01
LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f
LINUX_KERNEL_MD5SUM-3.14.28 = 3fd2be486a6348808a1f6a637d7eab8e LINUX_KERNEL_MD5SUM-3.14.29 = a745f70181b573a34579d685ca16370e
LINUX_KERNEL_MD5SUM-3.18.3 = 7f37f59b9f01945c9503bc9deed88820 LINUX_KERNEL_MD5SUM-3.18.3 = 7f37f59b9f01945c9503bc9deed88820
ifdef KERNEL_PATCHVER ifdef KERNEL_PATCHVER

View File

@ -510,7 +510,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, 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); 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, void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction) 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); EXPORT_SYMBOL(dma_cache_sync);

View File

@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
--- ---
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/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 config ARCH_MAY_HAVE_PC_FDC
bool bool

View File

@ -1,8 +1,6 @@
Index: linux-3.14.28/drivers/of/fdt.c --- a/drivers/of/fdt.c
=================================================================== +++ b/drivers/of/fdt.c
--- linux-3.14.28.orig/drivers/of/fdt.c 2015-01-08 10:01:03.000000000 -0800 @@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
+++ linux-3.14.28/drivers/of/fdt.c 2015-01-17 20:29:51.674740290 -0800
@@ -817,6 +817,9 @@
p = of_get_flat_dt_prop(node, "bootargs", &l); p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0) if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); 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 * CONFIG_CMDLINE is meant to be a default in case nothing else
Index: linux-3.14.28/arch/mips/kernel/prom.c --- a/arch/mips/kernel/prom.c
=================================================================== +++ b/arch/mips/kernel/prom.c
--- linux-3.14.28.orig/arch/mips/kernel/prom.c 2015-01-17 20:30:09.922830766 -0800 @@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
+++ linux-3.14.28/arch/mips/kernel/prom.c 2015-01-17 20:30:54.095049815 -0800
@@ -49,6 +49,9 @@
void __init __dt_setup_arch(struct boot_param_header *bph) void __init __dt_setup_arch(struct boot_param_header *bph)
{ {