mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
kernel: bump 5.4 to 5.4.265 (#11723)
This commit is contained in:
parent
6731232433
commit
ccadf36e98
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.4 = .264
|
||||
LINUX_KERNEL_HASH-5.4.264 = d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0
|
||||
LINUX_VERSION-5.4 = .265
|
||||
LINUX_KERNEL_HASH-5.4.265 = 4dae99e49f466d4689e128ec023754908147159d7462019a83c7da1f25df9b15
|
||||
|
@ -545,15 +545,15 @@
|
||||
* XXX skbs on the gro_list have all been parsed and pulled
|
||||
--- a/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;
|
||||
|
||||
struct in6_addr prefix;
|
||||
-};
|
||||
+} __attribute__((packed, aligned(2)));
|
||||
|
||||
#include <linux/ipv6.h>
|
||||
#include <linux/netdevice.h>
|
||||
/* rfc4861 4.6.2: IPv6 PIO is 32 bytes in size */
|
||||
static_assert(sizeof(struct prefix_info) == 32);
|
||||
--- a/include/net/inet_ecn.h
|
||||
+++ b/include/net/inet_ecn.h
|
||||
@@ -140,9 +140,9 @@ static inline int IP6_ECN_set_ce(struct
|
||||
|
@ -931,7 +931,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
eth_hw_addr_random(ndev);
|
||||
--- a/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;
|
||||
u8 legacy_mode = 0;
|
||||
u16 signature;
|
||||
@ -940,7 +940,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
if (!spi->dev.of_node) {
|
||||
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);
|
||||
|
||||
|
@ -1283,7 +1283,7 @@
|
||||
struct fib_table *tb;
|
||||
--- a/net/ipv6/addrconf.c
|
||||
+++ b/net/ipv6/addrconf.c
|
||||
@@ -7207,3 +7207,35 @@ void addrconf_cleanup(void)
|
||||
@@ -7203,3 +7203,35 @@ void addrconf_cleanup(void)
|
||||
|
||||
destroy_workqueue(addrconf_wq);
|
||||
}
|
||||
|
@ -78,7 +78,7 @@
|
||||
#endif /* _CONNTRACK_PROTO_GRE_H */
|
||||
--- a/include/net/addrconf.h
|
||||
+++ b/include/net/addrconf.h
|
||||
@@ -500,4 +500,9 @@ int if6_proc_init(void);
|
||||
@@ -508,4 +508,9 @@ int if6_proc_init(void);
|
||||
void if6_proc_exit(void);
|
||||
#endif
|
||||
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
||||
#include <linux/platform_data/x86/apple.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/suspend.h>
|
||||
@@ -5879,3 +5880,34 @@ static void nvidia_ion_ahci_fixup(struct
|
||||
@@ -5823,3 +5824,34 @@ static void nvidia_ion_ahci_fixup(struct
|
||||
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
||||
|
||||
--- a/drivers/mmc/core/core.c
|
||||
+++ b/drivers/mmc/core/core.c
|
||||
@@ -1380,6 +1380,8 @@ void mmc_power_off(struct mmc_host *host
|
||||
@@ -1382,6 +1382,8 @@ void mmc_power_off(struct mmc_host *host
|
||||
|
||||
mmc_pwrseq_power_off(host);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user