From be949a6fed102d41793be640a95cb83ba827c81d Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Fri, 3 Mar 2023 09:55:17 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.233 (#10955) --- include/kernel-5.4 | 4 ++-- ...ve-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) mode change 100755 => 100644 target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 890c999e8..bbdaa810c 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .232 -LINUX_KERNEL_HASH-5.4.232 = b0656a5e798b2dab5fb4c9da6398d388306ba2169848fc837a4133e85b430e93 +LINUX_VERSION-5.4 = .233 +LINUX_KERNEL_HASH-5.4.233 = 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 diff --git a/target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch b/target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch old mode 100755 new mode 100644 index 3e724ccba..6c66fe54e --- a/target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch +++ b/target/linux/generic/backport-5.4/904-v6.2-net-Remove-WARN_ON_ONCE-sk-sk_forward_alloc-from-sk_.patch @@ -74,11 +74,9 @@ Signed-off-by: Jakub Kicinski net/core/stream.c | 1 - 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 +++ 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; } sk_stream_kill_queues(&cf_sk->sk); @@ -86,11 +84,9 @@ index 8fa98c62c4fc..53f19ee5642f 100644 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 +++ 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); WARN_ON(sk->sk_wmem_queued); @@ -98,6 +94,3 @@ index d7c5413d16d5..cd60746877b1 100644 /* It is _impossible_ for the backlog to contain anything * when we get here. All user references to this socket --- -2.34.1 -