diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:19:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 19:22:23 +0200 |
| commit | f4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch) | |
| tree | 964f8813945913a7eaba920bda6a40be30516364 /target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch | |
| parent | 73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff) | |
| download | upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2 upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch b/target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch index 779127058a..995a8a8082 100644 --- a/target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch @@ -270,7 +270,7 @@ Signed-off-by: Tang Yuantian <andy.tang@nxp.com> writel(AHCI_PORT_AXICC_CFG, reg_base + PORT_AXICC); --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c -@@ -76,6 +76,7 @@ +@@ -75,6 +75,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/libata.h> @@ -278,7 +278,7 @@ Signed-off-by: Tang Yuantian <andy.tang@nxp.com> #include "libata.h" #include "libata-transport.h" -@@ -4119,6 +4120,8 @@ int sata_link_hardreset(struct ata_link +@@ -4118,6 +4119,8 @@ int sata_link_hardreset(struct ata_link */ ata_msleep(link->ap, 1); |