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:
parent
e4a5750931
commit
67f91dfa51
3 changed files with 5 additions and 10 deletions
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.14 = .61
|
|
||||||
LINUX_VERSION-4.9 = .119
|
LINUX_VERSION-4.9 = .119
|
||||||
|
LINUX_VERSION-4.14 = .62
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.14.61 = 0d0ec521a771e7d393f25b789a06d9af6e2a5a4837fadc04e7048e03b41c70e8
|
|
||||||
LINUX_KERNEL_HASH-4.9.119 = 49e17f01a1a607b4b1ab28dc7177e103943151866c3956fd83edc8a4aae60b35
|
LINUX_KERNEL_HASH-4.9.119 = 49e17f01a1a607b4b1ab28dc7177e103943151866c3956fd83edc8a4aae60b35
|
||||||
|
LINUX_KERNEL_HASH-4.14.62 = 51ca4d7e8ee156dc0f19bc7768915cfae41dbb0b4f251e4fa8b178c5674c22ab
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
|
|
@ -13,11 +13,9 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
||||||
drivers/w1/masters/w1-gpio.c | 7 +++----
|
drivers/w1/masters/w1-gpio.c | 7 +++----
|
||||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
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
|
--- a/drivers/w1/masters/w1-gpio.c
|
||||||
+++ b/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)
|
static int w1_gpio_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct w1_bus_master *master;
|
struct w1_bus_master *master;
|
||||||
|
@ -38,6 +36,3 @@ index a90728ceec5a..7b80762941af 100644
|
||||||
if (!pdata) {
|
if (!pdata) {
|
||||||
dev_err(&pdev->dev, "No configuration data\n");
|
dev_err(&pdev->dev, "No configuration data\n");
|
||||||
return -ENXIO;
|
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
|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
|
||||||
+++ b/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
|
/* get_link_status is set on LSC (link status) interrupt or
|
||||||
* Rx sequence error interrupt. get_link_status will stay
|
* 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
|
* for copper adapters ONLY
|
||||||
*/
|
*/
|
||||||
switch (hw->phy.media_type) {
|
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;
|
break;
|
||||||
case e1000_media_type_internal_serdes:
|
case e1000_media_type_internal_serdes:
|
||||||
ret_val = hw->mac.ops.check_for_link(hw);
|
ret_val = hw->mac.ops.check_for_link(hw);
|
||||||
|
|
Loading…
Reference in a new issue