Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.164
Browse files Browse the repository at this point in the history
No manual changes needed.

Link: openwrt/openwrt#16027
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
hauke committed Jul 29, 2024
1 parent f99dffc commit 07cb7cb
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Signed-off-by: Christopher Blake <[email protected]>
#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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.15/902-debloat_proc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- 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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#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()

Expand Down

0 comments on commit 07cb7cb

Please sign in to comment.