tsi: forward protocol field in proxy create enabling DGRAM+ICMP ping

patches/0001-krunfw-Don-t-panic-when-init-dies.patch

@@ -1,4 +1,4 @@
-From db20a79e5810bc9fc77655acde5c8e13e7942ba9 Mon Sep 17 00:00:00 2001
+From 0da747bedb82f4986ebe5103089d5041da049a51 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 2 Mar 2023 07:34:49 +0100
 Subject: [PATCH 01/34] krunfw: Don't panic when init dies
@@ -16,7 +16,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  2 files changed, 8 insertions(+)
 
 diff --git a/kernel/exit.c b/kernel/exit.c
-index d465b36bcc86..f5fd756b9097 100644
+index d465b36bc..f5fd756b9 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -69,6 +69,8 @@
@@ -42,7 +42,7 @@ index d465b36bcc86..f5fd756b9097 100644
  #ifdef CONFIG_POSIX_TIMERS
  		hrtimer_cancel(&tsk->signal->real_timer);
 diff --git a/kernel/reboot.c b/kernel/reboot.c
-index d6ee090eda94..f6947c5bd671 100644
+index d6ee090ed..f6947c5bd 100644
 --- a/kernel/reboot.c
 +++ b/kernel/reboot.c
 @@ -278,10 +278,12 @@ void kernel_restart(char *cmd)

patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch

@@ -1,4 +1,4 @@
-From 2e7df3e03121c97e16bb72de31e8b5ba9908971a Mon Sep 17 00:00:00 2001
+From 9b7db54d469f94f121f71ec906e3b1eb6de87a97 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Mon, 16 May 2022 16:04:27 +0200
 Subject: [PATCH 02/34] krunfw: Ignore run_cmd on orderly reboot
@@ -12,7 +12,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/kernel/reboot.c b/kernel/reboot.c
-index f6947c5bd671..5925d8fcfbfa 100644
+index f6947c5bd..5925d8fcf 100644
 --- a/kernel/reboot.c
 +++ b/kernel/reboot.c
 @@ -853,7 +853,11 @@ static int __orderly_reboot(void)

patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch

@@ -1,4 +1,4 @@
-From 8ca8db16da5001752ca7d782a60d9af85e7899b7 Mon Sep 17 00:00:00 2001
+From ea8aef6718f96ca37e39e6f0c225661cf3c80c95 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:28 +0000
 Subject: [PATCH 03/34] vsock/dgram: generalize recvmsg and drop
@@ -23,7 +23,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  9 files changed, 137 insertions(+), 52 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index 78cc66fbb3dd..fee8d1380e95 100644
+index 78cc66fbb..fee8d1380 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -421,9 +421,11 @@ static struct virtio_transport vhost_transport = {
@@ -40,7 +40,7 @@ index 78cc66fbb3dd..fee8d1380e95 100644
  		.stream_enqueue           = virtio_transport_stream_enqueue,
  		.stream_dequeue           = virtio_transport_stream_dequeue,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 0c67543a45c8..06d5b15642ae 100644
+index 0c67543a4..06d5b1564 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
 @@ -260,6 +260,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port);
@@ -54,7 +54,7 @@ index 0c67543a45c8..06d5b15642ae 100644
  int virtio_transport_connect(struct vsock_sock *vsk);
 
 diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
-index 70302c92d329..9ba6e2bcef94 100644
+index 70302c92d..9ba6e2bce 100644
 --- a/include/net/af_vsock.h
 +++ b/include/net/af_vsock.h
 @@ -120,11 +120,20 @@ struct vsock_transport {
@@ -81,7 +81,7 @@ index 70302c92d329..9ba6e2bcef94 100644
  	/* STREAM. */
  	/* TODO: stream_bind() */
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 282d97323324..fccb4761b8af 100644
+index 282d97323..fccb4761b 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -1359,10 +1359,62 @@ static int vsock_dgram_connect(struct socket *sock,
@@ -151,7 +151,7 @@ index 282d97323324..fccb4761b8af 100644
 
  int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
 diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
-index 56c232cf5b0f..cc0a6c3401d3 100644
+index 56c232cf5..cc0a6c340 100644
 --- a/net/vmw_vsock/hyperv_transport.c
 +++ b/net/vmw_vsock/hyperv_transport.c
 @@ -557,8 +557,17 @@ static int hvs_dgram_bind(struct vsock_sock *vsk, struct sockaddr_vm *addr)
@@ -186,7 +186,7 @@ index 56c232cf5b0f..cc0a6c3401d3 100644
  	.dgram_allow              = hvs_dgram_allow,
 
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index b6569b0ca2bb..d1107b65445e 100644
+index b6569b0ca..d1107b654 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -552,9 +552,11 @@ static struct virtio_transport virtio_transport = {
@@ -203,7 +203,7 @@ index b6569b0ca2bb..d1107b65445e 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 9b1f9a83c711..3ef8ff2a8b3c 100644
+index 9b1f9a83c..3ef8ff2a8 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -1069,6 +1069,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
@@ -232,7 +232,7 @@ index 9b1f9a83c711..3ef8ff2a8b3c 100644
  {
  	return false;
 diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
-index aca3132689cf..956109393596 100644
+index aca313268..956109393 100644
 --- a/net/vmw_vsock/vmci_transport.c
 +++ b/net/vmw_vsock/vmci_transport.c
 @@ -1731,57 +1731,40 @@ static int vmci_transport_dgram_enqueue(
@@ -331,7 +331,7 @@ index aca3132689cf..956109393596 100644
  	.stream_enqueue = vmci_transport_stream_enqueue,
  	.stream_has_data = vmci_transport_stream_has_data,
 diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c
-index 6e78927a598e..3d5e05d8950f 100644
+index 6e78927a5..3d5e05d89 100644
 --- a/net/vmw_vsock/vsock_loopback.c
 +++ b/net/vmw_vsock/vsock_loopback.c
 @@ -66,9 +66,11 @@ static struct virtio_transport loopback_transport = {

patches/0004-vsock-refactor-transport-lookup-code.patch

@@ -1,4 +1,4 @@
-From 0530d4f1e7c9112d492330d74bab3426ef4f5cf6 Mon Sep 17 00:00:00 2001
+From cd2567c2893c26ddb909d18f91e2f1e8f140b701 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:29 +0000
 Subject: [PATCH 04/34] vsock: refactor transport lookup code
@@ -14,7 +14,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index fccb4761b8af..4a8f62e7520d 100644
+index fccb4761b..4a8f62e75 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -432,6 +432,22 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)

patches/0005-vsock-support-multi-transport-datagrams.patch

@@ -1,4 +1,4 @@
-From 365643863f3166d827024d4b6067222a6453d015 Mon Sep 17 00:00:00 2001
+From 9cdf08429b6cbde858885db47b9d81c4fd4c50fa Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:30 +0000
 Subject: [PATCH 05/34] vsock: support multi-transport datagrams
@@ -57,7 +57,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  7 files changed, 60 insertions(+), 36 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index fee8d1380e95..03b0e789d161 100644
+index fee8d1380..03b0e789d 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -421,7 +421,6 @@ static struct virtio_transport vhost_transport = {
@@ -69,7 +69,7 @@ index fee8d1380e95..03b0e789d161 100644
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
  		.dgram_get_port		  = virtio_transport_dgram_get_port,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 06d5b15642ae..6c8791d3bc70 100644
+index 06d5b1564..6c8791d3b 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
 @@ -257,8 +257,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
@@ -82,7 +82,7 @@ index 06d5b15642ae..6c8791d3bc70 100644
  int virtio_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid);
  int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *port);
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 4a8f62e7520d..c15d9a6f8b89 100644
+index 4a8f62e75..c15d9a6f8 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -448,6 +448,18 @@ vsock_connectible_lookup_transport(unsigned int cid, __u8 flags)
@@ -238,7 +238,7 @@ index 4a8f62e7520d..c15d9a6f8b89 100644
 
  	/* sock map disallows redirection of non-TCP sockets with sk_state !=
 diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
-index cc0a6c3401d3..4c6d705cc9e6 100644
+index cc0a6c340..4c6d705cc 100644
 --- a/net/vmw_vsock/hyperv_transport.c
 +++ b/net/vmw_vsock/hyperv_transport.c
 @@ -552,11 +552,6 @@ static void hvs_destruct(struct vsock_sock *vsk)
@@ -262,7 +262,7 @@ index cc0a6c3401d3..4c6d705cc9e6 100644
  	.dgram_get_port		  = hvs_dgram_get_port,
  	.dgram_get_length	  = hvs_dgram_get_length,
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index d1107b65445e..e9828815e741 100644
+index d1107b654..e9828815e 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -551,7 +551,6 @@ static struct virtio_transport virtio_transport = {
@@ -274,7 +274,7 @@ index d1107b65445e..e9828815e741 100644
  		.dgram_allow              = virtio_transport_dgram_allow,
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 3ef8ff2a8b3c..70eee056871c 100644
+index 3ef8ff2a8..70eee0568 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -1062,13 +1062,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
@@ -292,7 +292,7 @@ index 3ef8ff2a8b3c..70eee056871c 100644
  {
  	return -EOPNOTSUPP;
 diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c
-index 3d5e05d8950f..9e9e124f8d2b 100644
+index 3d5e05d89..9e9e124f8 100644
 --- a/net/vmw_vsock/vsock_loopback.c
 +++ b/net/vmw_vsock/vsock_loopback.c
 @@ -65,7 +65,6 @@ static struct virtio_transport loopback_transport = {

patches/0006-vsock-make-vsock-bind-reusable.patch

@@ -1,4 +1,4 @@
-From cc6d6e946fdfd0e5aa2e1a9a1c6f4ecc199c2181 Mon Sep 17 00:00:00 2001
+From dc19a9346562235d5e58370b954f6de904860f06 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:31 +0000
 Subject: [PATCH 06/34] vsock: make vsock bind reusable
@@ -12,7 +12,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 26 insertions(+), 7 deletions(-)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index c15d9a6f8b89..30517b362fcc 100644
+index c15d9a6f8..30517b362 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -235,11 +235,12 @@ static void __vsock_remove_connected(struct vsock_sock *vsk)

patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch

@@ -1,4 +1,4 @@
-From 33ddfd0056365235338e46e289657fc1c1355bc2 Mon Sep 17 00:00:00 2001
+From f002441c13c5f155e858e0b9d16814b2604ccd29 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:32 +0000
 Subject: [PATCH 07/34] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit
@@ -12,7 +12,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
-index 64738838bee5..9c25f267bbc0 100644
+index 64738838b..9c25f267b 100644
 --- a/include/uapi/linux/virtio_vsock.h
 +++ b/include/uapi/linux/virtio_vsock.h
 @@ -40,6 +40,7 @@

patches/0008-virtio-vsock-support-dgrams.patch

@@ -1,4 +1,4 @@
-From 2883434bdf71f2441c1d34788fb138c010533254 Mon Sep 17 00:00:00 2001
+From cafd874340bcce2fa2799543d12e8060710f7ce3 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:33 +0000
 Subject: [PATCH 08/34] virtio/vsock: support dgrams
@@ -36,7 +36,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  8 files changed, 229 insertions(+), 59 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index 03b0e789d161..deaadc2503a2 100644
+index 03b0e789d..deaadc250 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -32,7 +32,8 @@
@@ -112,7 +112,7 @@ index 03b0e789d161..deaadc2503a2 100644
  		vq = &vsock->vqs[i];
  		mutex_lock(&vq->mutex);
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 6c8791d3bc70..e3d7afa29894 100644
+index 6c8791d3b..e3d7afa29 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
 @@ -257,7 +257,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
@@ -133,7 +133,7 @@ index 6c8791d3bc70..e3d7afa29894 100644
 +int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len);
  #endif /* _LINUX_VIRTIO_VSOCK_H */
 diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
-index 9ba6e2bcef94..5f93bb290a83 100644
+index 9ba6e2bce..5f93bb290 100644
 --- a/include/net/af_vsock.h
 +++ b/include/net/af_vsock.h
 @@ -230,6 +230,7 @@ void vsock_for_each_connected_socket(struct vsock_transport *transport,
@@ -145,7 +145,7 @@ index 9ba6e2bcef94..5f93bb290a83 100644
  /**** TAP ****/
 
 diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
-index 9c25f267bbc0..27b4b2b8bf13 100644
+index 9c25f267b..27b4b2b8b 100644
 --- a/include/uapi/linux/virtio_vsock.h
 +++ b/include/uapi/linux/virtio_vsock.h
 @@ -70,6 +70,7 @@ struct virtio_vsock_hdr {
@@ -157,7 +157,7 @@ index 9c25f267bbc0..27b4b2b8bf13 100644
 
  enum virtio_vsock_op {
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 30517b362fcc..e949c9892c2c 100644
+index 30517b362..e949c9892 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -118,6 +118,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
@@ -267,7 +267,7 @@ index 30517b362fcc..e949c9892c2c 100644
 
  	default:
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index e9828815e741..58d15edd296e 100644
+index e9828815e..58d15edd2 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -74,6 +74,7 @@ struct virtio_vsock {
@@ -329,7 +329,7 @@ index e9828815e741..58d15edd296e 100644
 
  static struct virtio_driver virtio_vsock_driver = {
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 70eee056871c..b3ee9ce90b5d 100644
+index 70eee0568..b3ee9ce90 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -140,6 +140,35 @@ static void virtio_transport_init_hdr(struct sk_buff *skb,
@@ -623,7 +623,7 @@ index 70eee056871c..b3ee9ce90b5d 100644
 
  	/* Release refcnt obtained when we fetched this socket out of the
 diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c
-index 9e9e124f8d2b..b3066c854bb9 100644
+index 9e9e124f8..b3066c854 100644
 --- a/net/vmw_vsock/vsock_loopback.c
 +++ b/net/vmw_vsock/vsock_loopback.c
 @@ -46,6 +46,7 @@ static int vsock_loopback_cancel_pkt(struct vsock_sock *vsk)

patches/0009-vsock-Add-support-for-SIOCINQ-ioctl.patch

@@ -1,4 +1,4 @@
-From 43fbbbc07f1ababcbfb305548aacdb5711dacf80 Mon Sep 17 00:00:00 2001
+From 32cb7650a5649f2baf76bd648a04ee56793a454e Mon Sep 17 00:00:00 2001
 From: Xuewei Niu <niuxuewei.nxw@antgroup.com>
 Date: Tue, 8 Jul 2025 14:36:12 +0800
 Subject: [PATCH 09/34] vsock: Add support for SIOCINQ ioctl
@@ -18,7 +18,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  1 file changed, 22 insertions(+)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index e949c9892c2c..23700ee6d732 100644
+index e949c9892..23700ee6d 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -1545,6 +1545,28 @@ static int vsock_do_ioctl(struct socket *sock, unsigned int cmd,

patches/0010-virtio-vsock-implement-has_data-for-DGRAM.patch

@@ -1,4 +1,4 @@
-From dcebe73b6fe14c1eb1c098c58dbcac9edc1df508 Mon Sep 17 00:00:00 2001
+From 5dc9e1c8c1a4553f806cc864263a87b0f0a33571 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 28 May 2026 11:43:46 +0200
 Subject: [PATCH 10/34] virtio/vsock: implement has_data for DGRAM
@@ -14,7 +14,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  6 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index e3d7afa29894..34220effc4b0 100644
+index e3d7afa29..34220effc 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
 @@ -215,6 +215,7 @@ ssize_t
@@ -26,7 +26,7 @@ index e3d7afa29894..34220effc4b0 100644
  s64 virtio_transport_stream_has_space(struct vsock_sock *vsk);
  u32 virtio_transport_seqpacket_has_data(struct vsock_sock *vsk);
 diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
-index 5f93bb290a83..45469aa8cf60 100644
+index 5f93bb290..45469aa8c 100644
 --- a/include/net/af_vsock.h
 +++ b/include/net/af_vsock.h
 @@ -76,6 +76,7 @@ struct vsock_sock {
@@ -46,7 +46,7 @@ index 5f93bb290a83..45469aa8cf60 100644
  	/* STREAM. */
  	/* TODO: stream_bind() */
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 23700ee6d732..ebd995fc6f5d 100644
+index 23700ee6d..ebd995fc6 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -1007,6 +1007,15 @@ s64 vsock_stream_has_data(struct vsock_sock *vsk)
@@ -79,7 +79,7 @@ index 23700ee6d732..ebd995fc6f5d 100644
  			ret = n_bytes;
  			break;
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index 58d15edd296e..43eeeb32a318 100644
+index 58d15edd2..43eeeb32a 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -558,6 +558,7 @@ static struct virtio_transport virtio_transport = {
@@ -91,7 +91,7 @@ index 58d15edd296e..43eeeb32a318 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index b3ee9ce90b5d..2cae5e2295b1 100644
+index b3ee9ce90..2cae5e229 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -907,6 +907,21 @@ int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len)
@@ -117,7 +117,7 @@ index b3ee9ce90b5d..2cae5e2295b1 100644
  {
  	struct virtio_vsock_sock *vvs = vsk->trans;
 diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c
-index b3066c854bb9..09e6162030b0 100644
+index b3066c854..09e616203 100644
 --- a/net/vmw_vsock/vsock_loopback.c
 +++ b/net/vmw_vsock/vsock_loopback.c
 @@ -71,6 +71,7 @@ static struct virtio_transport loopback_transport = {