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:
Koen Vandeputte 2018-08-09 17:16:11 +02:00
parent 21a229317f
commit 0ddb34b6b5
5 changed files with 10 additions and 23 deletions

View file

@ -3,12 +3,12 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .71 LINUX_VERSION-3.18 = .71
LINUX_VERSION-4.14 = .61
LINUX_VERSION-4.9 = .119 LINUX_VERSION-4.9 = .119
LINUX_VERSION-4.14 = .62
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
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)))))))

View file

@ -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);

View file

@ -1,7 +1,5 @@
Index: linux-4.14.60/drivers/net/phy/at803x.c --- a/drivers/net/phy/at803x.c
=================================================================== +++ b/drivers/net/phy/at803x.c
--- linux-4.14.60.orig/drivers/net/phy/at803x.c
+++ linux-4.14.60/drivers/net/phy/at803x.c
@@ -354,6 +354,14 @@ static int at803x_config_init(struct phy @@ -354,6 +354,14 @@ static int at803x_config_init(struct phy
AT803X_DEBUG_TX_CLK_DLY_EN, 0); AT803X_DEBUG_TX_CLK_DLY_EN, 0);
} }

View file

@ -11,8 +11,6 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS
create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 3fec84fa0..e685ce9a4 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -1062,6 +1062,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ @@ -1062,6 +1062,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
@ -23,9 +21,6 @@ index 3fec84fa0..e685ce9a4 100644
mt7623n-rfb-nand.dtb \ mt7623n-rfb-nand.dtb \
mt7623n-bananapi-bpi-r2.dtb \ mt7623n-bananapi-bpi-r2.dtb \
mt8127-moose.dtb \ mt8127-moose.dtb \
diff --git a/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
new file mode 100644
index 000000000..857d440d0
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts +++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
@ -47,9 +42,6 @@ index 000000000..857d440d0
+ reg = <0 0x80000000 0 0x20000000>; + reg = <0 0x80000000 0 0x20000000>;
+ }; + };
+}; +};
diff --git a/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi
new file mode 100644
index 000000000..adc91266e
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi +++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi
@@ -0,0 +1,366 @@ @@ -0,0 +1,366 @@
@ -419,6 +411,3 @@ index 000000000..adc91266e
+ status = "okay"; + status = "okay";
+}; +};
+ +
--
2.14.1

View file

@ -1,7 +1,6 @@
diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
--- linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:40:04.794444000 +0100 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+++ linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:41:04.880472000 +0100 @@ -87,7 +87,7 @@
@@ -88,7 +88,7 @@
sw4 { sw4 {
label = "sw4"; label = "sw4";
@ -18,3 +17,4 @@ diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc
+ dr_mode = "host"; + dr_mode = "host";
status = "okay"; status = "okay";
}; };