diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-11-18 18:24:32 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2021-11-19 09:40:29 +0000 |
commit | 3ae5da5adce90443426a477784e68cd9d49ded06 (patch) | |
tree | d4f444a667edc51ffdb55a156a2b5adc82244c9e /target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | |
parent | d745835ae19caf1999924a434abd25e92cce4343 (diff) | |
download | upstream-3ae5da5adce90443426a477784e68cd9d49ded06.tar.gz upstream-3ae5da5adce90443426a477784e68cd9d49ded06.tar.bz2 upstream-3ae5da5adce90443426a477784e68cd9d49ded06.zip |
kernel: bump 5.10 to 5.10.80
Deleted (upstreamed):
ath79/patches-5.10/921-serial-core-add-support-for-boot-console-with-arbitr.patch [1]
bcm53xx/patches-5.10/033-v5.15-0012-ARM-dts-BCM5301X-Fix-memory-nodes-names.patch [2]
lantiq/patches-5.10/0016-mtd-rawnand-xway-Keep-the-driver-compatible-with-on-.patch [3]
lantiq/patches-5.10/0110-MIPS-lantiq-dma-add-small-delay-after-reset.patch [4]
lantiq/patches-5.10/0111-MIPS-lantiq-dma-reset-correct-number-of-channel.patch [5]
lantiq/patches-5.10/0112-MIPS-lantiq-dma-fix-burst-length-for-DEU.patch [6]
Manually rebased:
ipq806x/patches-5.10/0065-arm-override-compiler-flags.patch
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=47462c5e600fbaffd755cd13dedd80d04e41ff83
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=2fde76df1885a6bec04317e457121326070450eb
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=9b366f5221d8aa64b22f35be137a5749326444ce
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=5af57ce8a6155fe3e4270d28d171abf8903bebc0
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=b92a5df2c7adc79a57481445f67de0c1c716581f
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.80&id=6b72caabc47011d03f44064452b2c65e8ed18326
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/732-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.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 340efbd7bc..ab723b7b42 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -1501,7 +1501,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 -@@ -1687,7 +1687,6 @@ davinci_emac_of_get_pdata(struct platfor +@@ -1699,7 +1699,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; @@ -1509,7 +1509,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); -@@ -1699,11 +1698,8 @@ davinci_emac_of_get_pdata(struct platfor +@@ -1711,11 +1710,8 @@ davinci_emac_of_get_pdata(struct platfor np = pdev->dev.of_node; pdata->version = EMAC_VERSION_2; |