diff options
| author |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-01-19 07:01:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2017-01-19 07:01:22 +0000 |
| commit | a89b8302db0346269f4202e95ca85dbbb6f75a8e (patch) | |
| tree | 873e234062fb0fcd8c71bd031bdaa217c877648c /meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb | |
| parent | 73e6110c6c12a875da9b6da46c8ddaaff79e3c79 (diff) | |
| parent | 793d8d01d0377dad21f4e1a330f00d822eced086 (diff) | |
Merge "Merge branch 'chinook_fixed' into chinook" into chinook
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 4a3e515..e8e80f2 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" |