summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2021-05-26 16:17:21 +0200
committerSimon Rettberg2021-05-26 16:17:21 +0200
commit629e609d16c546b2b2cad729a08163c8bb1c5b75 (patch)
tree05480e8fe84fcad604b95ab94da249548ecc0f79
parentchroot.inc: skip bind mounts of inexistant dirs (diff)
downloadmltk-629e609d16c546b2b2cad729a08163c8bb1c5b75.tar.gz
mltk-629e609d16c546b2b2cad729a08163c8bb1c5b75.tar.xz
mltk-629e609d16c546b2b2cad729a08163c8bb1c5b75.zip
[kernel-vanilla] Update to 5.10.40, remove intel hack
Patched upstream now
-rw-r--r--core/modules/kernel-vanilla/module.build1
-rw-r--r--core/modules/kernel-vanilla/module.conf2
2 files changed, 1 insertions, 2 deletions
diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build
index 3459dc21..a6a33f48 100644
--- a/core/modules/kernel-vanilla/module.build
+++ b/core/modules/kernel-vanilla/module.build
@@ -52,7 +52,6 @@ fetch_source() {
git apply < "$patch" || perror "Could not apply $patch"
echo "$patch" >> "patches-done"
done
- sed -i 's/batch_add(&cmds, 0xffff0000);/batch_add(\&cmds, 0xffff0000 | ((IS_IVB_GT1(i915) || IS_VALLEYVIEW(i915)) ? HIZ_RAW_STALL_OPT_DISABLE : 0));/' "drivers/gpu/drm/i915/gt/gen7_renderclear.c" || pwarning "Could not patch Ivybridge/Baytrail graphics."
cd -
# remember the current kernel version
echo "${SYSTEM_KERNEL_LONG}" > ksrc/KVERSION
diff --git a/core/modules/kernel-vanilla/module.conf b/core/modules/kernel-vanilla/module.conf
index cbc40e2e..95a9e849 100644
--- a/core/modules/kernel-vanilla/module.conf
+++ b/core/modules/kernel-vanilla/module.conf
@@ -2,5 +2,5 @@
REQUIRED_BINARIES=""
REQUIRED_LIBRARIES=""
REQUIRED_DIRECTORIES=""
-REQUIRED_KERNEL="5.10.37"
+REQUIRED_KERNEL="5.10.40"
REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"