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>
This commit is contained in:
@@ -13,11 +13,9 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
||||
drivers/w1/masters/w1-gpio.c | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
|
||||
index a90728ceec5a..7b80762941af 100644
|
||||
--- a/drivers/w1/masters/w1-gpio.c
|
||||
+++ b/drivers/w1/masters/w1-gpio.c
|
||||
@@ -112,17 +112,16 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
|
||||
@@ -112,17 +112,16 @@ static int w1_gpio_probe_dt(struct platf
|
||||
static int w1_gpio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct w1_bus_master *master;
|
||||
@@ -38,6 +36,3 @@ index a90728ceec5a..7b80762941af 100644
|
||||
if (!pdata) {
|
||||
dev_err(&pdev->dev, "No configuration data\n");
|
||||
return -ENXIO;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user