diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 16:59:49 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-06 12:51:52 +0100 |
commit | 810ee3b84a2b4399676a1799a25e34211bda7d60 (patch) | |
tree | fca2ad04fed6a76b5030bb06f0121c9f638faefb /target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch | |
parent | 5183df0dbf5f6b81c711b81e399a8c1be62bb838 (diff) | |
download | upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.tar.gz upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.tar.bz2 upstream-810ee3b84a2b4399676a1799a25e34211bda7d60.zip |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
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 4f9e2e29b5..eeb6b1ef19 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 -@@ -247,6 +247,184 @@ static unsigned int sfp_check(void *buf, +@@ -248,6 +248,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) { -@@ -415,6 +593,7 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -416,6 +594,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; -@@ -458,10 +637,83 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -459,10 +638,83 @@ static int sfp_sm_mod_probe(struct sfp * rev[4] = '\0'; memcpy(sn, sfp->id.ext.vendor_sn, 16); sn[16] = '\0'; |