diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-09 17:16:11 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-10 18:43:23 +0200 |
commit | 0ddb34b6b56d613939d4e6844b79415f9bf16939 (patch) | |
tree | 83e92363a1d2a11a28d238ac6c6726663254d01d /target/linux/generic | |
parent | 21a229317f63e89be9184f614a3270b0c9ec7100 (diff) | |
download | upstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.tar.gz upstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.tar.bz2 upstream-0ddb34b6b56d613939d4e6844b79415f9bf16939.zip |
kernel: bump 4.14 to 4.14.62
Refreshed all patches.
Compile-tested on: cns3xxx, imx6, x86_64
Runtime-tested on: cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
2 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch index 9889a33cb1..54858657cb 100644 --- a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch +++ b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch @@ -23,7 +23,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c -@@ -5093,7 +5093,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5082,7 +5082,7 @@ static bool e1000e_has_link(struct e1000 /* get_link_status is set on LSC (link status) interrupt or * Rx sequence error interrupt. get_link_status will stay @@ -32,7 +32,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> * for copper adapters ONLY */ switch (hw->phy.media_type) { -@@ -5111,7 +5111,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5100,7 +5100,7 @@ static bool e1000e_has_link(struct e1000 break; case e1000_media_type_internal_serdes: ret_val = hw->mac.ops.check_for_link(hw); diff --git a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch index daff25b633..6bc626dd6a 100644 --- a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch +++ b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch @@ -1,7 +1,5 @@ -Index: linux-4.14.60/drivers/net/phy/at803x.c -=================================================================== ---- linux-4.14.60.orig/drivers/net/phy/at803x.c -+++ linux-4.14.60/drivers/net/phy/at803x.c +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c @@ -354,6 +354,14 @@ static int at803x_config_init(struct phy AT803X_DEBUG_TX_CLK_DLY_EN, 0); } |