From c7d5fee20463ab55fdaffa6b946b28d3a12c038d Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 22 Apr 2015 09:35:36 +0000
Subject: [PATCH] generic/4.0: bump to final version

Linux 4.0 was released on 2014-04-12

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45559
---
 include/kernel-version.mk                               | 4 ++--
 target/linux/generic/patches-4.0/204-module_strip.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index bb43e00b0b..de20fefd80 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .11
-LINUX_VERSION-4.0 = -rc7
+LINUX_VERSION-4.0 =
 
 LINUX_KERNEL_MD5SUM-3.18.11 = 2def91951c9cedf7896efb864e0c090c
-LINUX_KERNEL_MD5SUM-4.0-rc7 = 26db663899b1a54397b4f184ca05f213
+LINUX_KERNEL_MD5SUM-4.0 = a86916bd12798220da9eb4a1eec3616d
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/generic/patches-4.0/204-module_strip.patch b/target/linux/generic/patches-4.0/204-module_strip.patch
index 84cd931c3e..584839aa7a 100644
--- a/target/linux/generic/patches-4.0/204-module_strip.patch
+++ b/target/linux/generic/patches-4.0/204-module_strip.patch
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  config INIT_ALL_POSSIBLE
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -2663,6 +2663,7 @@ static struct module *setup_load_info(st
+@@ -2680,6 +2680,7 @@ static struct module *setup_load_info(st
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  	const char *modmagic = get_modinfo(info, "vermagic");
  	int err;
  
-@@ -2688,6 +2689,7 @@ static int check_modinfo(struct module *
+@@ -2705,6 +2706,7 @@ static int check_modinfo(struct module *
  		pr_warn("%s: module is from the staging directory, the quality "
  			"is unknown, you have been warned.\n", mod->name);
  	}
-- 
2.30.2