From: Huacai Chen <chenhuacai@loongson.cn>
Date: Wed, 1 Nov 2023 02:55:00 +0000 (+0800)
Subject: Merge 'bpf-next 2023-10-16' into loongarch-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6bdc082ad1c91d389a6ba0c7a1945818f732114;p=linux.git

Merge 'bpf-next 2023-10-16' into loongarch-next

LoongArch architecture changes for 6.7 (BPF CPU v4 support) depend on
the bpf changes to fix conflictions in selftests and work, so merge them
to create a base.
---

a6bdc082ad1c91d389a6ba0c7a1945818f732114
diff --cc net/vmw_vsock/virtio_transport.c
index b80bf681327bd,09ba3128e7593..fdb95da120297
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@@ -677,8 -738,10 +752,11 @@@ static int virtio_vsock_probe(struct vi
  	if (ret < 0)
  		goto out;
  
+ 	for (i = 0; i < ARRAY_SIZE(vsock->out_sgs); i++)
+ 		vsock->out_sgs[i] = &vsock->out_bufs[i];
+ 
  	rcu_assign_pointer(the_virtio_vsock, vsock);
 +	virtio_vsock_vqs_start(vsock);
  
  	mutex_unlock(&the_virtio_vsock_mutex);