2 files changed, 7 insertions, 2 deletions

diff --git a/common/recipes-kernel/linux/linux-intel/fix.cfg b/common/recipes-kernel/linux/linux-intel/fix.cfg
new file mode 100644
index 00000000..e30c1891
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-intel/fix.cfg
@@ -0,0 +1,2 @@
+# CONFIG_DRM_CIRRUS_QEMU is not set
+CONFIG_SYNC_FILE=y
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb
index a029ee15..67873f23 100644
--- a/common/recipes-kernel/linux/linux-intel_4.9.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.9.bb
@@ -2,13 +2,16 @@
 require recipes-kernel/linux/linux-yocto.inc
 
 KBRANCH = "base"
-SRCREV_machine ?= "a0ddfd76aa47a9760d1d0fd504f78c666b95e28d"
+SRCREV_machine ?= "21df0f902c89e4ec40742b4cc8d1b65382db19d8"
 SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.9.6"
+LINUX_VERSION ?= "4.9.12"
+
+# Temporary fix until DRM is properly backported
+SRC_URI += "file://fix.cfg"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"