diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-02-01 20:07:47 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-02-01 23:34:07 +0000 |
| commit | ff97fb98e3176aef0378318d7ff52aaa85bfeb48 (patch) | |
| tree | 0f45d6c0dbb9e1f68ee0a8e3050115ce2dd34ddd /target/linux/generic/backport-5.10 | |
| parent | b9736cb78c508dfeda7178973fe4fb9eb12c6a1b (diff) | |
| download | upstream-ff97fb98e3176aef0378318d7ff52aaa85bfeb48.tar.gz upstream-ff97fb98e3176aef0378318d7ff52aaa85bfeb48.tar.bz2 upstream-ff97fb98e3176aef0378318d7ff52aaa85bfeb48.zip | |
kernel: bump 5.10 to 5.10.96
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10')
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-11-net-resolve-forwarding-path-from-virtual-netdevice-a.patch b/target/linux/generic/backport-5.10/610-v5.13-11-net-resolve-forwarding-path-from-virtual-netdevice-a.patch index 34c4dc20b7..a8fc1cabe2 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-11-net-resolve-forwarding-path-from-virtual-netdevice-a.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-11-net-resolve-forwarding-path-from-virtual-netdevice-a.patch @@ -104,7 +104,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> }; /** -@@ -2827,6 +2852,8 @@ void dev_remove_offload(struct packet_of +@@ -2828,6 +2853,8 @@ void dev_remove_offload(struct packet_of int dev_get_iflink(const struct net_device *dev); int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); 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 f2b04d4955..68fb423a54 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 @@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int irq; --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -4990,7 +4990,7 @@ int stmmac_dvr_probe(struct device *devi +@@ -4988,7 +4988,7 @@ int stmmac_dvr_probe(struct device *devi priv->wol_irq = res->wol_irq; priv->lpi_irq = res->lpi_irq; |