298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.233 (#10955)

Browse Source
This commit is contained in:
aakkll 2023-03-03 09:55:17 +08:00 committed by GitHub
parent c82dd3df02
commit be949a6fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .232 LINUX_VERSION-5.4 = .233
LINUX_KERNEL_HASH-5.4.232 = b0656a5e798b2dab5fb4c9da6398d388306ba2169848fc837a4133e85b430e93 LINUX_KERNEL_HASH-5.4.233 = 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627

11
target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch Executable file → Normal file
View File

@ -74,11 +74,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/stream.c | 1 - net/core/stream.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-) 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 8fa98c62c4fc..53f19ee5642f 100644
--- a/net/caif/caif_socket.c --- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c
@@ -1022,6 +1022,7 @@ static void caif_sock_destructor(struct sock *sk) @@ -1022,6 +1022,7 @@ static void caif_sock_destructor(struct
return; return;
} }
sk_stream_kill_queues(&cf_sk->sk); sk_stream_kill_queues(&cf_sk->sk);
@ -86,11 +84,9 @@ index 8fa98c62c4fc..53f19ee5642f 100644
caif_free_client(&cf_sk->layer); caif_free_client(&cf_sk->layer);
} }
diff --git a/net/core/stream.c b/net/core/stream.c
index d7c5413d16d5..cd60746877b1 100644
--- a/net/core/stream.c --- a/net/core/stream.c
+++ b/net/core/stream.c +++ b/net/core/stream.c
@@ -209,7 +209,6 @@ void sk_stream_kill_queues(struct sock *sk) @@ -209,7 +209,6 @@ void sk_stream_kill_queues(struct sock *
sk_mem_reclaim(sk); sk_mem_reclaim(sk);
WARN_ON(sk->sk_wmem_queued); WARN_ON(sk->sk_wmem_queued);
@ -98,6 +94,3 @@ index d7c5413d16d5..cd60746877b1 100644
/* It is _impossible_ for the backlog to contain anything /* It is _impossible_ for the backlog to contain anything
* when we get here. All user references to this socket * when we get here. All user references to this socket
--
2.34.1