diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-01-25 17:29:41 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-01-25 17:29:41 +0000 |
| commit | ee3eade28597b7fe4157c55b816af69a94ca4d0a (patch) | |
| tree | 9114f91c9f960eacee4cab43bc85c0cf23c0bde1 | |
| parent | 6fbf35501e410aef676e14a0ce19942fc7f58940 (diff) | |
| download | upstream-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
4 files changed, 11 insertions, 15 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d0c4bf6df5..5d621a1ec4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,14 +5,14 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.8 = .13 LINUX_VERSION-3.10 = .58 LINUX_VERSION-3.13 = .7 -LINUX_VERSION-3.14 = .28 +LINUX_VERSION-3.14 = .29 LINUX_VERSION-3.18 = .3 LINUX_VERSION-3.19 = -rc5 LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 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 ifdef KERNEL_PATCHVER 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) { |