diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:18:03 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:54:50 +0200 |
commit | bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43 (patch) | |
tree | 3a7483d6cbea7bd69acabe03761df9709bc20c33 /target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch | |
parent | 0f3d54f5b70c42c2b0f7802970dac123ea0f8689 (diff) | |
download | upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.gz upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.bz2 upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.zip |
kernel: bump 4.14 to 4.14.136
Refreshed all patches.
Altered patches:
- 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
Remove upstreamed:
- 100-powerpc-4xx-uic-clear-pending-interrupt-after-irq-ty.patch
- 088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch
- 500-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch
Fixes:
- CVE-2019-13648
- CVE-2019-10207
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch index ccc9896b50..c531c375a0 100644 --- a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch +++ b/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -264,6 +264,184 @@ static unsigned int sfp_check(void *buf, +@@ -265,6 +265,184 @@ static unsigned int sfp_check(void *buf, return check; } @@ -195,7 +195,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Helpers */ static void sfp_module_tx_disable(struct sfp *sfp) { -@@ -432,6 +610,7 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -433,6 +611,7 @@ static int sfp_sm_mod_probe(struct sfp * char sn[17]; char date[9]; char rev[5]; @@ -203,7 +203,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> u8 check; int err; -@@ -475,10 +654,83 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -476,10 +655,83 @@ static int sfp_sm_mod_probe(struct sfp * rev[4] = '\0'; memcpy(sn, sfp->id.ext.vendor_sn, 16); sn[16] = '\0'; |