aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-10-25 14:36:20 -0400
committerNick Hainke <vincent@systemli.org>2023-10-26 12:08:52 +0200
commitcd86f6c24daace0c5c610dbc2a2c472014598ecd (patch)
treef1318c0db6aef5ddc799ed537efcc04ffdb07b4a /target/linux/ath79
parent732ae343ffb3ad19978b75a8105d55f5e6d1d435 (diff)
downloadupstream-cd86f6c24daace0c5c610dbc2a2c472014598ecd.tar.gz
upstream-cd86f6c24daace0c5c610dbc2a2c472014598ecd.tar.bz2
upstream-cd86f6c24daace0c5c610dbc2a2c472014598ecd.zip
kernel: bump 6.1 to 6.1.60
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.60 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-6.1/800-leds-add-reset-controller-based-driver.patch2
-rw-r--r--target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/patches-6.1/800-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-6.1/800-leds-add-reset-controller-based-driver.patch
index 18d5e149923..e9349b4f8c7 100644
--- a/target/linux/ath79/patches-6.1/800-leds-add-reset-controller-based-driver.patch
+++ b/target/linux/ath79/patches-6.1/800-leds-add-reset-controller-based-driver.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -872,6 +872,17 @@ source "drivers/leds/flash/Kconfig"
+@@ -873,6 +873,17 @@ source "drivers/leds/flash/Kconfig"
comment "RGB LED drivers"
source "drivers/leds/rgb/Kconfig"
diff --git a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
index 2d35ae1d34f..30f23d4814b 100644
--- a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
@@ -336,7 +336,7 @@ SVN-Revision: 35130
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
-@@ -1488,8 +1488,8 @@ struct sk_buff *inet_gro_receive(struct
+@@ -1494,8 +1494,8 @@ struct sk_buff *inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out;