diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-29 22:42:38 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:21:01 +0200 |
commit | 2d5ee43dc6390d84620807c741d2cb0e272b49ce (patch) | |
tree | 8a446db7162217f8536fd099bc4d027aa591e091 /target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch | |
parent | a205de55941b025f6f85ac19005496c726d6e157 (diff) | |
download | upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.gz upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.tar.bz2 upstream-2d5ee43dc6390d84620807c741d2cb0e272b49ce.zip |
kernel: bump 5.4 to 5.4.137
Manually rebased
generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
All others updated automatically.
Compile-tested on: ramips/mt7621, armvirt/32
Runtime-tested on: ramips/mt7621, armvirt/32
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch')
-rw-r--r-- | target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch index 0c7830cb47..b42192d9fd 100644 --- a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch +++ b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch @@ -37,7 +37,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts -@@ -126,7 +126,6 @@ +@@ -132,7 +132,6 @@ status = "okay"; max-link-speed = <2>; reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; |