summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-10-13 03:53:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 16:36:17 (GMT)
commitcdfe99f22ae14f24b0d12691bd1382995b84e8db (patch)
tree8ccb7cc5a1f9d00bf9054afce0095c0785a44c7d /meta/recipes-kernel/linux
parentfc0a068d478b8f2b950ab049c5445ed12bca4027 (diff)
downloadpoky-cdfe99f22ae14f24b0d12691bd1382995b84e8db.tar.gz
linux-yocto/3.10: 8250/8250_dw: fix compile failure due to stable/Yocto conflict
Updating the SRCREVs for the following fix: 8250/8250_dw: fix compile failure due to stable/Yocto conflict As of merge 60a9d9fc565e4503dbb8705803e83d906afc4ad2, "Merge tag 'v3.10.48' into standard/base" the 8250_dw.c fails to compile due to an undeclared variable. This happens because stable brought in: ------------------------- commit 6d5e79331417886196cb3a733bdb6645ba85bc42 Author: Tim Kryger <tim.kryger@linaro.org> Date: Tue Oct 1 10:18:08 2013 -0700 serial: 8250_dw: Improve unwritable LCR workaround commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream. [...] [wangnan: backport to 3.10.43: - adjust context - remove unneeded local var] Signed-off-by: Wang Nan <wangnan0@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ------------------------ ...which deletes the p->private_data declaration since it became unused at that point, however in Yocto, we also have this: ----------------------- commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9 Author: David Daney <david.daney@cavium.com> Date: Wed Jun 19 20:37:27 2013 +0000 tty/8250_dw: Add support for OCTEON UARTS. [...] Signed-off-by: Ralf Baechle <ralf@linux-mips.org> (cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438) Signed-off-by: Darren Hart <dvhart@linux.intel.com> ----------------------- ...which _adds_ another user of the p->private_data. Here we restore the declaration in order that 8250_dw compiles. Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> [PG: add root cause info to commit log.] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> (From OE-Core rev: 4b4d1f38ea54ef8545e726ac9e181da08a2bad05) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb14
3 files changed, 10 insertions, 10 deletions
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 1075972..ad55a2e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
3 3
4require recipes-kernel/linux/linux-yocto.inc 4require recipes-kernel/linux/linux-yocto.inc
5 5
6SRCREV_machine ?= "0abce5181274dbf37788ab8d2c62e135defd9956" 6SRCREV_machine ?= "cbaa8c8b83a7da70b94cc6cc1a25090071af4c3f"
7SRCREV_machine_qemuppc ?= "c31f38edf5dec2c295632199dbfe3f5a221f7c16" 7SRCREV_machine_qemuppc ?= "41338ab2a1c19435e24bbd162ff6b3f8b90d7afa"
8SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" 8SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index a53ce54..9e33aa6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.55"
9 9
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72" 12SRCREV_machine ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
13SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" 13SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index ea69856..e612d36 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -10,13 +10,13 @@ KBRANCH_qemux86 ?= "standard/common-pc/base"
10KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" 10KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
11KBRANCH_qemumips64 ?= "standard/mti-malta64" 11KBRANCH_qemumips64 ?= "standard/mti-malta64"
12 12
13SRCREV_machine_qemuarm ?= "a4195791d27ef50feb454765149ea34621ef8ed7" 13SRCREV_machine_qemuarm ?= "9c8da40f662806406940decf972841c1b86895a5"
14SRCREV_machine_qemumips ?= "ff747b3dff7dfa643b3447a348b901cacc5b6a16" 14SRCREV_machine_qemumips ?= "96adff9ce54c009ba90c3ddcaa6d16beb7a9c2b3"
15SRCREV_machine_qemuppc ?= "46e30d608f4268b0ea77362398aae91f1d410ee3" 15SRCREV_machine_qemuppc ?= "cf3a9a021e2abb3b19807b2ba3c29c1d0918730b"
16SRCREV_machine_qemux86 ?= "8e055f3b669c65e83ba7128c248c632eedafad72" 16SRCREV_machine_qemux86 ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
17SRCREV_machine_qemux86-64 ?= "8e055f3b669c65e83ba7128c248c632eedafad72" 17SRCREV_machine_qemux86-64 ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
18SRCREV_machine_qemumips64 ?= "42457c568170cb11a9011382ebca4677f22b35c1" 18SRCREV_machine_qemumips64 ?= "89ab3082e01c4d98f9d14630aa904dba641c5373"
19SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72" 19SRCREV_machine ?= "3677ea7f9476458aa6dec440243de3a6fb1343a9"
20SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" 20SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"