aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-06-04 20:06:00 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-06-05 22:54:00 +0300
commite52f3e9b13763cbfbd92fca8db0b4d19dc1e309e (patch)
tree804a13ddc9ccf75e3f0ae38102ddbf950806ea79 /include
parent7590c3c58f5e9d580c86da10473d1d29a2f081c9 (diff)
downloadupstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.gz
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.bz2
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.zip
kernel: bump 4.14 to 4.14.48
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'include')
-rw-r--r--include/kernel-version.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 877fa880f5..3e92303729 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .71
LINUX_VERSION-4.4 = .121
LINUX_VERSION-4.9 = .105
-LINUX_VERSION-4.14 = .44
+LINUX_VERSION-4.14 = .48
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
LINUX_KERNEL_HASH-4.9.105 = d085d228e3ac1fdbdf5a31bb8154e4e8a0943a9085f0384842601db8e9d96dc4
-LINUX_KERNEL_HASH-4.14.44 = 2eb356e6af25f6ca65affe7704be8c4e0cdf224505e7441ac9d5b6e8d96ec8e4
+LINUX_KERNEL_HASH-4.14.48 = 80a0608f611fe7a5c54556402cdc2880a21301e1c4e1b19d4c1db82ad2bf22b9
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))