generic/3.18: update to 3.18.3
authorImre Kaloz <kaloz@openwrt.org>
Sun, 25 Jan 2015 11:39:30 +0000 (11:39 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Sun, 25 Jan 2015 11:39:30 +0000 (11:39 +0000)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44121

include/kernel-version.mk
target/linux/generic/patches-3.18/997-device_tree_cmdline.patch

index 638df54..24bb9b1 100644 (file)
@@ -6,13 +6,13 @@ LINUX_VERSION-3.8  = .13
 LINUX_VERSION-3.10 = .58
 LINUX_VERSION-3.13 = .7
 LINUX_VERSION-3.14 = .28
-LINUX_VERSION-3.18 = .2
+LINUX_VERSION-3.18 = .3
 
 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.18.2  = 7b28d5543cf3647d2483830af19f3770
+LINUX_KERNEL_MD5SUM-3.18.3  = 7f37f59b9f01945c9503bc9deed88820
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
index b3aa1d1..dd725b0 100644 (file)
@@ -1,8 +1,6 @@
-Index: linux-3.18.2/drivers/of/fdt.c
-===================================================================
---- linux-3.18.2.orig/drivers/of/fdt.c 2015-01-17 20:57:52.419074654 -0800
-+++ linux-3.18.2/drivers/of/fdt.c      2015-01-17 20:57:52.367074398 -0800
-@@ -903,6 +903,9 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -903,6 +903,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.18.2/drivers/of/fdt.c
  
        /*
         * CONFIG_CMDLINE is meant to be a default in case nothing else
-Index: linux-3.18.2/arch/mips/kernel/prom.c
-===================================================================
---- linux-3.18.2.orig/arch/mips/kernel/prom.c  2015-01-17 20:57:52.419074654 -0800
-+++ linux-3.18.2/arch/mips/kernel/prom.c       2015-01-17 20:57:52.415074633 -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(void *bph)
  {