diff options
| author | John Audia <graysky@archlinux.us> | 2022-04-20 06:44:30 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-23 20:46:25 +0200 |
| commit | cab20be008591f89dd89c4e444cdf022fa7f57eb (patch) | |
| tree | f3d3a5dee30c7ad8903f596847d4f9f257ec0bc5 /target/linux/ath79/patches-5.10 | |
| parent | b8ed98b10004d5de25c1b4b2d2b59b15fc04f794 (diff) | |
| download | upstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.tar.gz upstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.tar.bz2 upstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.zip | |
kernel: bump 5.10 to 5.10.112
Manually rebased:
ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath79/patches-5.10')
| -rw-r--r-- | target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch | 14 | ||||
| -rw-r--r-- | target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch b/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch index 8849afb4d6..1788419c70 100644 --- a/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch +++ b/target/linux/ath79/patches-5.10/600-of_net-add-mac-address-ascii-support.patch @@ -1,8 +1,6 @@ -Index: linux-5.15.31/net/ethernet/eth.c -=================================================================== ---- linux-5.15.31.orig/net/ethernet/eth.c -+++ linux-5.15.31/net/ethernet/eth.c -@@ -544,6 +544,63 @@ int eth_platform_get_mac_address(struct +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c +@@ -545,6 +545,63 @@ int eth_platform_get_mac_address(struct } EXPORT_SYMBOL(eth_platform_get_mac_address); @@ -64,9 +62,9 @@ Index: linux-5.15.31/net/ethernet/eth.c +}; + /** - * nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named - * 'mac-address' associated with given device. -@@ -557,19 +614,23 @@ int nvmem_get_mac_address(struct device + * Obtain the MAC address from an nvmem cell named 'mac-address' associated + * with given device. +@@ -558,19 +615,23 @@ int nvmem_get_mac_address(struct device { struct nvmem_cell *cell; const void *mac; diff --git a/target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch b/target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch index 5b3260eecb..e6fae3349d 100644 --- a/target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch +++ b/target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch @@ -14,13 +14,13 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- a/drivers/net/mdio/mdio-bitbang.c +++ b/drivers/net/mdio/mdio-bitbang.c -@@ -14,6 +14,7 @@ - * Vitaly Bordug <vbordug@ru.mvista.com> +@@ -15,6 +15,7 @@ */ + #include <linux/delay.h> +#include <linux/irqflags.h> - #include <linux/module.h> #include <linux/mdio-bitbang.h> + #include <linux/module.h> #include <linux/types.h> @@ -153,7 +154,9 @@ static int mdiobb_read(struct mii_bus *b { |