[openwrt/openwrt] kernel: bump 5.15 to 5.15.164

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 29 14:12:26 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/07cb7cb8856c4c00cac705d5814d1f8d642ce4e3

commit 07cb7cb8856c4c00cac705d5814d1f8d642ce4e3
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Mon Jul 29 00:28:51 2024 +0200

    kernel: bump 5.15 to 5.15.164
    
    No manual changes needed.
    
    Link: https://github.com/openwrt/openwrt/pull/16027
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 include/kernel-5.15                                                   | 4 ++--
 target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch      | 2 +-
 ...50-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch | 2 +-
 ...50-0090-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch | 2 +-
 target/linux/generic/hack-5.15/902-debloat_proc.patch                 | 2 +-
 .../100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index ca3d50bfc2..85d9ab6c2d 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .163
-LINUX_KERNEL_HASH-5.15.163 = 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302
+LINUX_VERSION-5.15 = .164
+LINUX_KERNEL_HASH-5.15.164 = ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186
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 60b616830c..dfef4cc91f 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
@@ -337,7 +337,7 @@ SVN-Revision: 35130
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1489,8 +1489,8 @@ struct sk_buff *inet_gro_receive(struct
+@@ -1491,8 +1491,8 @@ struct sk_buff *inet_gro_receive(struct
  	if (unlikely(ip_fast_csum((u8 *)iph, 5)))
  		goto out_unlock;
  
diff --git a/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
index 88ce707c83..02f2d5e517 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
@@ -76,7 +76,7 @@ Signed-off-by: Christopher Blake <chrisrblake93 at gmail.com>
  #endif
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
-@@ -529,6 +529,9 @@ do {									\
+@@ -519,6 +519,9 @@ do {									\
  extern unsigned long __must_check
  arm_copy_from_user(void *to, const void __user *from, unsigned long n);
  
diff --git a/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
index 33d3e3b7b6..01d335eefb 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM64: Force hardware emulation of deprecated
 
 --- a/arch/arm64/kernel/armv8_deprecated.c
 +++ b/arch/arm64/kernel/armv8_deprecated.c
-@@ -546,10 +546,15 @@ static void __init register_insn_emulati
+@@ -549,10 +549,15 @@ static void __init register_insn_emulati
  
  	switch (insn->status) {
  	case INSN_DEPRECATED:
diff --git a/target/linux/generic/hack-5.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch
index a161ed90d5..783bc6b6a4 100644
--- a/target/linux/generic/hack-5.15/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.15/902-debloat_proc.patch
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
 
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -3008,6 +3008,8 @@ static const struct seq_operations locks
+@@ -3006,6 +3006,8 @@ static const struct seq_operations locks
  
  static int __init proc_locks_init(void)
  {
diff --git a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
index 22f52c1d46..7bbda83861 100644
--- a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
+++ b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  #endif /* __KERNEL__ */
  
  /*
-@@ -252,6 +254,4 @@ static inline void *offset_to_ptr(const
+@@ -258,6 +260,4 @@ static inline void *offset_to_ptr(const
   */
  #define prevent_tail_call_optimization()	mb()
  




More information about the lede-commits mailing list