kernel: bump 5.10 to 5.10.205 (#11730)

Signed-off-by: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com>
This commit is contained in:
Beginner 2023-12-22 15:43:59 +08:00 committed by GitHub
parent ccadf36e98
commit d0f140b6c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .204 LINUX_VERSION-5.10 = .205
LINUX_KERNEL_HASH-5.10.204 = ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee LINUX_KERNEL_HASH-5.10.205 = c55217a80d74f81b83116289a8bfe4302293390b45aeabb76f64814920788863

View File

@ -579,15 +579,15 @@ SVN-Revision: 35130
* XXX skbs on the gro_list have all been parsed and pulled * XXX skbs on the gro_list have all been parsed and pulled
--- a/include/net/addrconf.h --- a/include/net/addrconf.h
+++ b/include/net/addrconf.h +++ b/include/net/addrconf.h
@@ -47,7 +47,7 @@ struct prefix_info { @@ -52,7 +52,7 @@ struct prefix_info {
__be32 reserved2; __be32 reserved2;
struct in6_addr prefix; struct in6_addr prefix;
-}; -};
+} __attribute__((packed, aligned(2))); +} __attribute__((packed, aligned(2)));
#include <linux/ipv6.h> /* rfc4861 4.6.2: IPv6 PIO is 32 bytes in size */
#include <linux/netdevice.h> static_assert(sizeof(struct prefix_info) == 32);
--- a/include/net/inet_ecn.h --- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h +++ b/include/net/inet_ecn.h
@@ -140,9 +140,9 @@ static inline int IP6_ECN_set_ce(struct @@ -140,9 +140,9 @@ static inline int IP6_ECN_set_ce(struct

View File

@ -967,7 +967,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);
--- a/drivers/net/ethernet/qualcomm/qca_spi.c --- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -884,7 +884,7 @@ qca_spi_probe(struct spi_device *spi) @@ -902,7 +902,7 @@ qca_spi_probe(struct spi_device *spi)
struct net_device *qcaspi_devs = NULL; struct net_device *qcaspi_devs = NULL;
u8 legacy_mode = 0; u8 legacy_mode = 0;
u16 signature; u16 signature;
@ -976,7 +976,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!spi->dev.of_node) { if (!spi->dev.of_node) {
dev_err(&spi->dev, "Missing device tree\n"); dev_err(&spi->dev, "Missing device tree\n");
@@ -961,12 +961,8 @@ qca_spi_probe(struct spi_device *spi) @@ -979,12 +979,8 @@ qca_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, qcaspi_devs); spi_set_drvdata(spi, qcaspi_devs);
@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int irq; int irq;
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5019,7 +5019,7 @@ int stmmac_dvr_probe(struct device *devi @@ -5016,7 +5016,7 @@ int stmmac_dvr_probe(struct device *devi
priv->wol_irq = res->wol_irq; priv->wol_irq = res->wol_irq;
priv->lpi_irq = res->lpi_irq; priv->lpi_irq = res->lpi_irq;

View File

@ -78,7 +78,7 @@
#endif #endif
--- a/include/linux/if_vlan.h --- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h
@@ -222,7 +222,28 @@ extern void vlan_vids_del_by_dev(struct @@ -230,7 +230,28 @@ extern void vlan_vids_del_by_dev(struct
extern bool vlan_uses_dev(const struct net_device *dev); extern bool vlan_uses_dev(const struct net_device *dev);
@ -627,7 +627,7 @@
struct fib_table *tb; struct fib_table *tb;
--- a/include/net/addrconf.h --- a/include/net/addrconf.h
+++ b/include/net/addrconf.h +++ b/include/net/addrconf.h
@@ -506,4 +506,9 @@ int if6_proc_init(void); @@ -514,4 +514,9 @@ int if6_proc_init(void);
void if6_proc_exit(void); void if6_proc_exit(void);
#endif #endif
@ -639,7 +639,7 @@
#endif #endif
--- a/net/ipv6/addrconf.c --- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c
@@ -7287,3 +7287,35 @@ void addrconf_cleanup(void) @@ -7283,3 +7283,35 @@ void addrconf_cleanup(void)
destroy_workqueue(addrconf_wq); destroy_workqueue(addrconf_wq);
} }