aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-06-21 12:17:06 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-25 16:05:18 +0200
commit51c397c33fc47202d50ca90c779f1c3239ebbc3f (patch)
tree14799ee783a84cbbe23a67b572771c503b319e49 /target/linux/ath79
parentb1b829ad6a71f32c0f8a669db53264cf5b1f259b (diff)
downloadupstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.tar.gz
upstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.tar.bz2
upstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.zip
kernel: bump 5.15 to 5.15.118
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 1f5fce27c195373fedcf233a48470de97752058f)
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch2
-rw-r--r--target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch b/target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch
index 9bce3a2633..9d014434ec 100644
--- a/target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch
+++ b/target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -256,6 +256,8 @@ config ATH79
+@@ -257,6 +257,8 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
index c2b646643e..ad685fb13b 100644
--- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
@@ -784,7 +784,7 @@ SVN-Revision: 35130
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
-@@ -275,8 +275,10 @@ static inline bool neigh_key_eq128(const
+@@ -270,8 +270,10 @@ static inline bool neigh_key_eq128(const
const u32 *n32 = (const u32 *)n->primary_key;
const u32 *p32 = pkey;