From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 14 Nov 2013 16:55:25 +0000 (-0500)
Subject: linux-yocto-rt/3.10: fix ntp merge issue
X-Git-Tag: rev_ivi_2015_02_04~10384
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=949d01ad6aa944194a8e68e420bed107a3bbe4aa;p=scm%2Fbb%2Ftizen-distro.git

linux-yocto-rt/3.10: fix ntp merge issue

Updating the -rt SRCREVs to pick up the following fix:

    ntp: fix ntp_notify_cmos_timer merge issue

    PREEMPT_RT_FULL has a stubbed ntp_notify_cmos_timer due to a bad merge.
    Renaming and restoring the full -rt functionality to this routine.

(From OE-Core rev: 41d4f0feca69bf1b41f16f5f7d21bf7540e6c47a)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index ab36e6a..c8b9888 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c"
-SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75"
-SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7"
+SRCREV_machine ?= "baed5453f830d06075a4480ec0ded8ff785828bc"
+SRCREV_machine_qemuppc ?= "26a465af89793c7dc5a81661449c5a9f0ad06dee"
+SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"