summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-01-28 10:08:52 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-01-28 11:39:18 +0100
commite243db2b4d1ae31e4e7f89364d60ed246aa46702 (patch)
tree6dfae20e16f5bab96d07d6ebbc7f94b64752f184 /recipes-kernel/linux/linux-toradex-mainline_4.14.bb
parentd4580e8d2e81365e27c3002cdbb19aa272478cd2 (diff)
linux-toradex-mainline: update to 4.14.168
Remove upstreamed patch: Commit acab21ffa8c0951f2180f80184c921fa4799c786 'mmc: core: fix possible use after free of host' fixes the issue with the same change as 0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit db41fd66b3b56ef1f33ac2ef9eacb33d41cd1738) Conflicts: recipes-kernel/linux/linux-toradex-mainline_4.14.bb Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-mainline_4.14.bb')
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_4.14.bb7
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
index 9cd8e08..f2e9316 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
@@ -11,7 +11,7 @@ inherit kernel siteinfo toradex-kernel-localversion
# git hash not available since tarball from kernel.org is used
SCMVERSION = "n"
-LINUX_VERSION ?= "4.14.160"
+LINUX_VERSION ?= "4.14.168"
PV = "${LINUX_VERSION}"
S = "${WORKDIR}/linux-${PV}"
@@ -30,7 +30,6 @@ GENERIC_PATCHES = " \
file://0012-apalis-tk1-support-for-k20-mfd.patch \
file://0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch \
file://0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch \
- file://0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch \
file://0016-Revert-mmc-core-simplify-ida-handling.patch \
file://0017-mmc-read-mmc-alias-from-device-tree.patch \
file://0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch \
@@ -60,8 +59,8 @@ SRC_URI = " \
${GENERIC_PATCHES} \
${MACHINE_PATCHES} \
"
-SRC_URI[md5sum] = "286501d9badbb724fddbc6e20e46aa1e"
-SRC_URI[sha256sum] = "c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c"
+SRC_URI[md5sum] = "e3447527902445b779f5eff66de5bc8c"
+SRC_URI[sha256sum] = "db5777d3a12a85bc8c130b7b250bab2283f9d964b725e5de3c216b495eeb31fe"
# For CI use one could use the following instead (plus patches still of course)
LINUX_VERSION_use-head-next ?= "4.14"