aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-06 14:21:05 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-07 17:21:24 +0200
commitb4bd6c2c95bf1365338697e77c6a3001506a7e4b (patch)
tree8c687e682796d52599ad93d066aaac5c7ca99030
parent6bbb2202551be394fead2efd99eb946f846fc63d (diff)
downloadupstream-b4bd6c2c95bf1365338697e77c6a3001506a7e4b.tar.gz
upstream-b4bd6c2c95bf1365338697e77c6a3001506a7e4b.tar.bz2
upstream-b4bd6c2c95bf1365338697e77c6a3001506a7e4b.zip
kernel: bump 3.18 to 3.18.121
Refreshed all patches. Compile-tested on: adm5120 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/pending-3.18/002-phy_drivers_backport.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 98adc9e397..916120c046 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,13 +2,13 @@
LINUX_RELEASE?=1
-LINUX_VERSION-3.18 = .119
LINUX_VERSION-4.9 = .124
LINUX_VERSION-4.14 = .67
+LINUX_VERSION-3.18 = .121
-LINUX_KERNEL_HASH-3.18.119 = 2bab623ed868b679eac224f62212cc285264061bedf1e32897f72e35aa26160d
LINUX_KERNEL_HASH-4.9.124 = 5ca6b0d48c8dd1265005169f1b97149a4e893668c0d8aa566a73c7663c8e4311
LINUX_KERNEL_HASH-4.14.67 = 3f4b056dc27233a78f7a4a35ed6fdcfd0a9680ec40b611a898bb6c8b905070ba
+LINUX_KERNEL_HASH-3.18.121 = 7a8a996433e4af1abd2903f91c390295745d90dd178607b3af82f2df5f95c9b0
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch b/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch
index c500138309..c718f8ee6f 100644
--- a/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch
+++ b/target/linux/generic/pending-3.18/002-phy_drivers_backport.patch
@@ -223,7 +223,7 @@
MODULE_LICENSE("GPL");
--- a/drivers/net/phy/ar8327.c
+++ b/drivers/net/phy/ar8327.c
-@@ -627,11 +627,11 @@ ar8327_hw_init(struct ar8xxx_priv *priv)
+@@ -619,11 +619,11 @@ ar8327_hw_init(struct ar8xxx_priv *priv)
if (!priv->chip_data)
return -ENOMEM;