From ccadf36e984038f564c45826c6e081a251a0e59d Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:30:11 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.265 (#11723) --- include/kernel-5.4 | 4 ++-- .../ath79/patches-5.4/910-unaligned_access_hacks.patch | 6 +++--- ...1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 ++-- .../ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch | 2 +- .../ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch | 2 +- ...I-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch | 2 +- ...5-mmc-core-set-initial-signal-voltage-on-power-off.patch | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 73627fc22..a6b44269c 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -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 diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index 3a9c1a444..0179f7568 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch @@ -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 - #include + /* 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 diff --git a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 92bd39f9f..a9ecc2903 100644 --- a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -931,7 +931,7 @@ Signed-off-by: David S. Miller 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 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); diff --git a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch index a9d443ca1..63a578c0d 100644 --- a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch @@ -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); } diff --git a/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch index cd8256ed2..91c308187 100644 --- a/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch @@ -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 diff --git a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch index 0400d1e9d..ef3beb56d 100644 --- a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch +++ b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch @@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey #include #include #include -@@ -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); diff --git a/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch b/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch index 698f6465b..921028c0b 100644 --- a/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch +++ b/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch @@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman --- 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);