[meta-intel] [rocko][PATCH 5/7] linux-intel/4.14: use master cache until named branch available

[California Sullivan]

It wasn't appropriate to use the 4.9 cache for 4.14. This also brings in
the following relevant commits:

* b6b5ac8d x86-64: disable orc by default
* 82743ab8 common-pc*.scc: Add igb to common-pc drivers
* 6bcc7298 features/i915/i915.cfg: compile i915 as a module

This adds Intel gigabit Ethernet drivers, fixes the i915 firmware load
issue, and fixes an lttng-modules compilation failure with the new
kernel due to the new CONFIG_UNWINDER_ORC=y default.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
[Fixed location]
(commit 5e02959f5cb81784b08cb7e4e027c058089c1ee7 upstream)
Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 common/recipes-kernel/linux/linux-intel_4.14.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/recipes-kernel/linux/linux-intel_4.14.bb b/common/recipes-kernel/linux/linux-intel_4.14.bb
index dd44aa1f..0d5dbdde 100644
--- a/common/recipes-kernel/linux/linux-intel_4.14.bb
+++ b/common/recipes-kernel/linux/linux-intel_4.14.bb
@@ -1,14 +1,14 @@
 require linux-intel.inc
 
 KBRANCH = "4.14/yocto/base"
-KMETA_BRANCH = "yocto-4.9"
+KMETA_BRANCH = "master"
 
 # Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
 SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
 
 LINUX_VERSION ?= "4.14.0"
 SRCREV_machine ?= "bebc6082da0a9f5d47a1ea2edc099bf671058bd4"
-SRCREV_meta ?= "f4e37e151102d89c4d0e110c88eb3b3c36bdeaa4"
+SRCREV_meta ?= "ee7e849882aa2f0947dd56a60ba5b0d2eec558f2"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
-- 
2.14.3