diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-27 14:56:33 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-28 16:32:45 +0100 |
| commit | bbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch) | |
| tree | e874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | |
| parent | 26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff) | |
| download | upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2 upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip | |
kernel: bump 5.4 to 5.4.161
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 55149150c9..ea77969f50 100644 --- a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -1385,7 +1385,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (ret) --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -1685,7 +1685,6 @@ davinci_emac_of_get_pdata(struct platfor +@@ -1697,7 +1697,6 @@ davinci_emac_of_get_pdata(struct platfor const struct of_device_id *match; const struct emac_platform_data *auxdata; struct emac_platform_data *pdata = NULL; @@ -1393,7 +1393,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (!IS_ENABLED(CONFIG_OF) || !pdev->dev.of_node) return dev_get_platdata(&pdev->dev); -@@ -1697,11 +1696,8 @@ davinci_emac_of_get_pdata(struct platfor +@@ -1709,11 +1708,8 @@ davinci_emac_of_get_pdata(struct platfor np = pdev->dev.of_node; pdata->version = EMAC_VERSION_2; |