diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2017-01-18 11:32:11 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2017-01-18 11:32:43 +0900 |
| commit | 793d8d01d0377dad21f4e1a330f00d822eced086 (patch) | |
| tree | 002df733dc532616ede3f90a6392ebc5ce0f316b /meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb | |
| parent | d53759600dc1e97ce47ba7b0f7958b105012386a (diff) | |
| parent | 2420779506844c8b8cf2f50d8f08b622dc6468f6 (diff) | |
Merge branch 'chinook_fixed' into chinook
This merge is needed to support cluster combination of AGL
CES2017 Demo.
Change-Id: Iad92027680273ac0ad931a916fe2c3cafa91d600
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb')
| -rw-r--r-- | meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb index 4ef7e25..4d8e332 100644 --- a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb +++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb @@ -17,6 +17,7 @@ SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-g file://0001-arm-koelsch-Add-vmalloc-384M-to-bootargs-of-DTS.patch \ file://0001-arm-alt-Add-vmalloc-384M-to-bootargs-of-DTS.patch \ file://0001-arm-gose-Add-vmalloc-384M-to-bootargs-of-DTS.patch \ + file://0001-ASoC-ak4642-Replace-mdelay-function-to-msleep.patch \ " SRC_URI_append_porter = " \ @@ -156,6 +157,9 @@ SRC_URI_append_smack = " \ SRC_URI_append_porter = " file://can-rcar.cfg" +# Backport fix for CVE-2016-5195 +SRC_URI_append = " file://9999-Backport-fix-for-CVE-2016-5195.patch " + S = "${WORKDIR}/git" KERNEL_DEFCONFIG = "shmobile_defconfig" |