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 10ae66b1024db238899ccce1f790620ab5c92aa9 Mon Sep 17 00:00:00 2001
+From 8f5cfa9cb869b732453c0157eb0e6829068adc12 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/30] 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 b91124b2d334..b78ea85c953a 100644
+index b91124b2d..b78ea85c9 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -69,6 +69,8 @@
@@ -42,7 +42,7 @@ index b91124b2d334..b78ea85c953a 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 41ad056fb2d1e2ff14b5cc4384f17f7f45e72eb3 Mon Sep 17 00:00:00 2001
+From 147e31e804d4468c2b915bff024a466d5daf2030 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/30] 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 72bd47b54d947e297cf4298b8da2cdfc59215135 Mon Sep 17 00:00:00 2001
+From 8bbca5cb1813c344d9d4b2a8e29762635b811372 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/30] 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 1db7a1f8e55f..460c9893e112 100644
+index 1db7a1f8e..460c9893e 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 1db7a1f8e55f..460c9893e112 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 34871ed1a099..0746f7fb2809 100644
+index 34871ed1a..0746f7fb2 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 34871ed1a099..0746f7fb2809 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 9550773fe1e1..f5f61f87da83 100644
+index 9550773fe..f5f61f87d 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -1053,6 +1053,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
@@ -232,7 +232,7 @@ index 9550773fe1e1..f5f61f87da83 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 72e122bd7c78f5ea881fc1be7b81ce6e89bb6a03 Mon Sep 17 00:00:00 2001
+From d63781408fa5316fde13e2b397220c14064e1c69 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/30] 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 460c9893e112..8049e3b4f377 100644
+index 460c9893e..8049e3b4f 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 6f8f8b27658ac6345af71dea9ef97850faf704cd Mon Sep 17 00:00:00 2001
+From 13e84b075b6b616e59dca49d28dee70b50aea8f0 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/30] 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 8049e3b4f377..9046ea82a37b 100644
+index 8049e3b4f..9046ea82a 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 8049e3b4f377..9046ea82a37b 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 0746f7fb2809..b5822a5ed92f 100644
+index 0746f7fb2..b5822a5ed 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 0746f7fb2809..b5822a5ed92f 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 f5f61f87da83..3a996272764b 100644
+index f5f61f87d..3a9962727 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -1046,13 +1046,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
@@ -292,7 +292,7 @@ index f5f61f87da83..3a996272764b 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 20265fb6e3a0cb720723450b5fa7e8017616b514 Mon Sep 17 00:00:00 2001
+From 40f49d936c30df509a5c0fb913dbfa2f1e3902b4 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/30] 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 9046ea82a37b..6d3e95d94f76 100644
+index 9046ea82a..6d3e95d94 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 afc5971d193d97700ad23b13287fcbcf3c0d2e4a Mon Sep 17 00:00:00 2001
+From 087024177b57e8bc30d2f4b4caa4947244692043 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/30] 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 c9a2af154eb0cc87fd31eea4c536e349dae2f346 Mon Sep 17 00:00:00 2001
+From 7919e5ace25dc1a6ce8d17b565bb343feef3c400 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/30] virtio/vsock: support dgrams
@@ -36,7 +36,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  8 files changed, 198 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 6d3e95d94f76..7c9c8696a07a 100644
+index 6d3e95d94..7c9c8696a 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 6d3e95d94f76..7c9c8696a07a 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 3a996272764b..a7e9bcc49a8e 100644
+index 3a9962727..a7e9bcc49 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -227,7 +227,9 @@ EXPORT_SYMBOL_GPL(virtio_transport_deliver_tap_pkt);
@@ -578,7 +578,7 @@ index 3a996272764b..a7e9bcc49a8e 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 52e07de426f743550a3954c9d5168ecfe051ef28 Mon Sep 17 00:00:00 2001
+From dbcbf54a2d50a36a9b15393c4aeb4abbbd4a18b6 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/30] 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 7c9c8696a07a..3b420d8f0c84 100644
+index 7c9c8696a..3b420d8f0 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 adc7bebfd1e4dff1a2160fb587fc534f38463cba Mon Sep 17 00:00:00 2001
+From 0808f83c2853094e12ff42a74f60f881d02ed713 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/30] 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 3b420d8f0c84..73e2eac4c3af 100644
+index 3b420d8f0..73e2eac4c 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 3b420d8f0c84..73e2eac4c3af 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 a7e9bcc49a8e..6498ab12ce31 100644
+index a7e9bcc49..6498ab12c 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -862,6 +862,21 @@ int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len)
@@ -117,7 +117,7 @@ index a7e9bcc49a8e..6498ab12ce31 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 = {