diff options
| author | John Audia <therealgraysky@proton.me> | 2023-04-20 08:53:55 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-22 01:15:03 +0200 |
| commit | 126c64df2bb6dec95906c1f68aa37e581ef2550f (patch) | |
| tree | 3bf569ce11a6b5744a6a54394f2617ca36ad962d /target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch | |
| parent | 3887a55909aa26c3366fd0206772280da850ab16 (diff) | |
| download | upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.gz upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.bz2 upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.zip | |
kernel: bump 5.10 to 5.10.178
Removed upstreamed:
backport-5.10/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1]
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.178&id=0279e82e148407feec88466990de14bcba9e12c0
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch b/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch index 4d49908ec9..5711add940 100644 --- a/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch +++ b/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -4492,6 +4492,14 @@ static const struct macb_config sama7g5_ +@@ -4496,6 +4496,14 @@ static const struct macb_config sama7g5_ .usrio = &sama7g5_usrio, }; @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at32ap7000-macb" }, { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, -@@ -4510,6 +4518,7 @@ static const struct of_device_id macb_dt +@@ -4514,6 +4522,7 @@ static const struct of_device_id macb_dt { .compatible = "cdns,zynq-gem", .data = &zynq_config }, { .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config }, { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config }, |