kernel: Replace vsock email series with upstream patches

The vsock patches were merged into mainline in v4.8-rc1, replace the patches
based on the email posting with cherry-picks. The patches appear identical so
the only change here is to the annotation of the origin which now references an
upstream commit instead of a message-id.

Add one new upstream patch b226acab2f6a "VSOCK: Use kvfree()"

Signed-off-by: Ian Campbell <ian.campbell@docker.com>

alpine/kernel/patches/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch

@@ -1,7 +1,7 @@
 From 0d67af6648f600656eb20cb2ca1d35cb0985e9bd Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Thu, 17 Dec 2015 16:53:43 +0800
-Subject: [PATCH 01/45] virtio: make find_vqs() checkpatch.pl-friendly
+Subject: [PATCH 01/46] virtio: make find_vqs() checkpatch.pl-friendly
 
 checkpatch.pl wants arrays of strings declared as follows:
 

alpine/kernel/patches/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch

@@ -1,7 +1,7 @@
 From f1e0be6f17679e7f532989bae3290bb4ed3ba773 Mon Sep 17 00:00:00 2001
 From: Julia Lawall <julia.lawall@lip6.fr>
 Date: Sat, 21 Nov 2015 18:39:17 +0100
-Subject: [PATCH 02/45] VSOCK: constify vmci_transport_notify_ops structures
+Subject: [PATCH 02/46] VSOCK: constify vmci_transport_notify_ops structures
 
 The vmci_transport_notify_ops structures are never modified, so declare
 them as const.

alpine/kernel/patches/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch

@@ -1,7 +1,7 @@
 From bc63a861a8379269f4a51fdaac3d40f9161aea4d Mon Sep 17 00:00:00 2001
 From: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
 Date: Tue, 22 Mar 2016 17:05:52 +0100
-Subject: [PATCH 03/45] AF_VSOCK: Shrink the area influenced by prepare_to_wait
+Subject: [PATCH 03/46] AF_VSOCK: Shrink the area influenced by prepare_to_wait
 
 When a thread is prepared for waiting by calling prepare_to_wait, sleeping
 is not allowed until either the wait has taken place or finish_wait has

alpine/kernel/patches/0004-vsock-make-listener-child-lock-ordering-explicit.patch

@@ -1,7 +1,7 @@
 From c1bc13ebe28532f99cb6b8edaa57a6aa61adbe58 Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Thu, 23 Jun 2016 16:28:58 +0100
-Subject: [PATCH 04/45] vsock: make listener child lock ordering explicit
+Subject: [PATCH 04/46] vsock: make listener child lock ordering explicit
 
 There are several places where the listener and pending or accept queue
 child sockets are accessed at the same time.  Lockdep is unhappy that

alpine/kernel/patches/0005-VSOCK-transport-specific-vsock_transport-functions.patch

@@ -1,7 +1,7 @@
-From fdce29497e948f4a9f9417b4a908ec54feb1c9fa Mon Sep 17 00:00:00 2001
+From 3351d8e1a0e52529aea4b5c3ce0c2ef3ad43ee17 Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:30 +0100
-Subject: [PATCH 05/45] VSOCK: transport-specific vsock_transport functions
+Subject: [PATCH 05/46] VSOCK: transport-specific vsock_transport functions
 
 struct vsock_transport contains function pointers called by AF_VSOCK
 core code.  The transport may want its own transport-specific function
@@ -13,7 +13,8 @@ access transport-specific function pointers.
 The virtio transport will use this.
 
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-2-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 0b01aeb3d2fbf16787f0c9629f4ca52ae792f732)
 ---
  include/net/af_vsock.h   | 3 +++
  net/vmw_vsock/af_vsock.c | 9 +++++++++

alpine/kernel/patches/0006-VSOCK-defer-sock-removal-to-transports.patch

@@ -1,7 +1,7 @@
-From 30d9aa8b6b1c2fa720917ede2315223ca0c5d538 Mon Sep 17 00:00:00 2001
+From 54f528a28ab97e1306180adde7ba15c4158428db Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:31 +0100
-Subject: [PATCH 06/45] VSOCK: defer sock removal to transports
+Subject: [PATCH 06/46] VSOCK: defer sock removal to transports
 
 The virtio transport will implement graceful shutdown and the related
 SO_LINGER socket option.  This requires orphaning the sock but keeping
@@ -11,7 +11,8 @@ This patch adds the vsock_remove_sock() function and leaves it up to the
 transport when to remove the sock.
 
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-3-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 6773b7dc39f165bd9d824b50ac52cbb3f87d53c8)
 ---
  include/net/af_vsock.h         |  1 +
  net/vmw_vsock/af_vsock.c       | 16 ++++++++++------

alpine/kernel/patches/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch

@@ -1,7 +1,7 @@
-From 3c8c257cbb209af1d2a8a7bed7e4fb385e82b813 Mon Sep 17 00:00:00 2001
+From ec54f262b84f327f1c0ecabce6f0c9b5c75ff2df Mon Sep 17 00:00:00 2001
 From: Asias He <asias@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:32 +0100
-Subject: [PATCH 07/45] VSOCK: Introduce virtio_vsock_common.ko
+Subject: [PATCH 07/46] VSOCK: Introduce virtio_vsock_common.ko
 
 This module contains the common code and header files for the following
 virtio_transporto and vhost_vsock kernel modules.
@@ -9,7 +9,8 @@ virtio_transporto and vhost_vsock kernel modules.
 Signed-off-by: Asias He <asias@redhat.com>
 Signed-off-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-4-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 06a8fc78367d070720af960dcecec917d3ae5f3b)
 ---
  MAINTAINERS                                        |  10 +
  include/linux/virtio_vsock.h                       | 154 ++++

alpine/kernel/patches/0008-VSOCK-Introduce-virtio_transport.ko.patch

@@ -1,14 +1,15 @@
-From c6a12128d92b89b3d424e7cd3dd3c6cbfe4e1011 Mon Sep 17 00:00:00 2001
+From e21bdf5a9a62fbdabddca3cafc8aa2b02f2cc165 Mon Sep 17 00:00:00 2001
 From: Asias He <asias@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:33 +0100
-Subject: [PATCH 08/45] VSOCK: Introduce virtio_transport.ko
+Subject: [PATCH 08/46] VSOCK: Introduce virtio_transport.ko
 
 VM sockets virtio transport implementation.  This driver runs in the
 guest.
 
 Signed-off-by: Asias He <asias@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-5-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 0ea9e1d3a9e3ef7d2a1462d3de6b95131dc7d872)
 ---
  MAINTAINERS                      |   1 +
  net/vmw_vsock/virtio_transport.c | 624 +++++++++++++++++++++++++++++++++++++++

alpine/kernel/patches/0009-VSOCK-Introduce-vhost_vsock.ko.patch

@@ -1,14 +1,15 @@
-From 007cc7ab2d6af1c213b5d5e8fc0cd651bad8f486 Mon Sep 17 00:00:00 2001
+From 7cba4e91a9e1359345ccb7dbff243cedf5b5e6ea Mon Sep 17 00:00:00 2001
 From: Asias He <asias@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:34 +0100
-Subject: [PATCH 09/45] VSOCK: Introduce vhost_vsock.ko
+Subject: [PATCH 09/46] VSOCK: Introduce vhost_vsock.ko
 
 VM sockets vhost transport implementation.  This driver runs on the
 host.
 
 Signed-off-by: Asias He <asias@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-6-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 433fc58e6bf2c8bd97e57153ed28e64fd78207b8)
 ---
  MAINTAINERS                |   2 +
  drivers/vhost/vsock.c      | 722 +++++++++++++++++++++++++++++++++++++++++++++

alpine/kernel/patches/0010-VSOCK-Add-Makefile-and-Kconfig.patch

@@ -1,25 +1,26 @@
-From d8b94a29a8e7fee77250aaa1ab3b1f80ad6c8882 Mon Sep 17 00:00:00 2001
+From 5600cbdcb09f2a322c696e37570d031932a3baa4 Mon Sep 17 00:00:00 2001
 From: Asias He <asias@redhat.com>
 Date: Thu, 28 Jul 2016 15:36:35 +0100
-Subject: [PATCH 10/45] VSOCK: Add Makefile and Kconfig
+Subject: [PATCH 10/46] VSOCK: Add Makefile and Kconfig
 
 Enable virtio-vsock and vhost-vsock.
 
 Signed-off-by: Asias He <asias@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(from RFC v6 <1469716595-13591-7-git-send-email-stefanha@redhat.com>)
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit 304ba62fd4e670c1a5784585da0fac9f7309ef6c)
 ---
- drivers/vhost/Kconfig  | 15 +++++++++++++++
+ drivers/vhost/Kconfig  | 14 ++++++++++++++
  drivers/vhost/Makefile |  4 ++++
  net/vmw_vsock/Kconfig  | 20 ++++++++++++++++++++
  net/vmw_vsock/Makefile |  6 ++++++
- 4 files changed, 45 insertions(+)
+ 4 files changed, 44 insertions(+)
 
 diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
-index 533eaf0..d7aae9e 100644
+index 533eaf0..2b5f588 100644
 --- a/drivers/vhost/Kconfig
 +++ b/drivers/vhost/Kconfig
-@@ -21,6 +21,21 @@ config VHOST_SCSI
+@@ -21,6 +21,20 @@ config VHOST_SCSI
  	Say M here to enable the vhost_scsi TCM fabric module
  	for use with virtio-scsi guests
  
@@ -28,7 +29,6 @@ index 533eaf0..d7aae9e 100644
 +	depends on VSOCKETS && EVENTFD
 +	select VIRTIO_VSOCKETS_COMMON
 +	select VHOST
-+	select VHOST_RING
 +	default n
 +	---help---
 +	This kernel module can be loaded in the host kernel to provide AF_VSOCK

alpine/kernel/patches/0011-VSOCK-Use-kvfree.patch

@@ -0,0 +1,33 @@
+From d722f0d8acd78f91e079f2fe0b4e4a29b42435b7 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <weiyj.lk@gmail.com>
+Date: Tue, 2 Aug 2016 13:50:42 +0000
+Subject: [PATCH 11/46] VSOCK: Use kvfree()
+
+Use kvfree() instead of open-coding it.
+
+Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit b226acab2f6aaa45c2af27279b63f622b23a44bd)
+---
+ drivers/vhost/vsock.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
+index 028ca16..0ddf3a2 100644
+--- a/drivers/vhost/vsock.c
++++ b/drivers/vhost/vsock.c
+@@ -434,10 +434,7 @@ err:
+ 
+ static void vhost_vsock_free(struct vhost_vsock *vsock)
+ {
+-	if (is_vmalloc_addr(vsock))
+-		vfree(vsock);
+-	else
+-		kfree(vsock);
++	kvfree(vsock);
+ }
+ 
+ static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
+-- 
+2.9.3
+

alpine/kernel/patches/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch

@@ -1,7 +1,7 @@
-From 4438a0966cd79254fcab325f7495130314f339cd Mon Sep 17 00:00:00 2001
+From f2e2e9e439f717e454a1cf0e71e098b19ff0005d Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Thu, 4 Aug 2016 14:52:53 +0100
-Subject: [PATCH 11/45] vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
+Subject: [PATCH 12/46] vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
 
 Stash the packet length in a local variable before handing over
 ownership of the packet to virtio_transport_recv_pkt() or
@@ -19,7 +19,7 @@ Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index 028ca16..9e10fb5 100644
+index 0ddf3a2..e3b30ea 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -307,6 +307,8 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work)

alpine/kernel/patches/0013-virtio-vsock-fix-include-guard-typo.patch

@@ -1,7 +1,7 @@
-From f829b4b9d6ef1fa1d2859f5eceb9001c772541c3 Mon Sep 17 00:00:00 2001
+From 1a8274f5f22a79f10aae3b4cf35f9b8a65f7f423 Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Fri, 5 Aug 2016 13:52:09 +0100
-Subject: [PATCH 12/45] virtio-vsock: fix include guard typo
+Subject: [PATCH 13/46] virtio-vsock: fix include guard typo
 
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

alpine/kernel/patches/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch

@@ -1,7 +1,7 @@
-From 1294bdb2bffedfa825a8572926ba90fa522746c2 Mon Sep 17 00:00:00 2001
+From 5377a4a3e61adb924efdb4ff47ca2213c63e5bc4 Mon Sep 17 00:00:00 2001
 From: Gerard Garcia <ggarcia@deic.uab.cat>
 Date: Wed, 10 Aug 2016 17:24:34 +0200
-Subject: [PATCH 13/45] vhost/vsock: drop space available check for TX vq
+Subject: [PATCH 14/46] vhost/vsock: drop space available check for TX vq
 
 Remove unnecessary use of enable/disable callback notifications
 and the incorrect more space available check.

alpine/kernel/patches/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch

@@ -1,7 +1,7 @@
-From a39cc29b3cb531e73d4f03e64e12fc0de62f8d03 Mon Sep 17 00:00:00 2001
+From fc2bc563ce2a5205b7504c39e8dbb0a5db2d63e9 Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ian.campbell@docker.com>
 Date: Mon, 4 Apr 2016 14:50:10 +0100
-Subject: [PATCH 14/45] VSOCK: Only allow host network namespace to use
+Subject: [PATCH 15/46] VSOCK: Only allow host network namespace to use
  AF_VSOCK.
 
 The VSOCK addressing schema does not really lend itself to simply creating an

alpine/kernel/patches/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch

@@ -1,7 +1,7 @@
-From 7dc9f307981ebd10ed716a56a0795af7c3f8ae90 Mon Sep 17 00:00:00 2001
+From 7c37cbd1fd8bff6d8373cff4d7e1c33fcb2aa653 Mon Sep 17 00:00:00 2001
 From: Jake Oshins <jakeo@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:41 -0800
-Subject: [PATCH 15/45] drivers:hv: Define the channel type for Hyper-V PCI
+Subject: [PATCH 16/46] drivers:hv: Define the channel type for Hyper-V PCI
  Express pass-through
 
 This defines the channel type for PCI front-ends in Hyper-V VMs.

alpine/kernel/patches/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch

@@ -1,7 +1,7 @@
-From 935d2a3a0446c6b2f256729bd91974e800bef25f Mon Sep 17 00:00:00 2001
+From b26f3791593f6645c4e0e11fd93db7e47390fab6 Mon Sep 17 00:00:00 2001
 From: "K. Y. Srinivasan" <kys@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:43 -0800
-Subject: [PATCH 16/45] Drivers: hv: vmbus: Use uuid_le type consistently
+Subject: [PATCH 17/46] Drivers: hv: vmbus: Use uuid_le type consistently
 
 Consistently use uuid_le type in the Hyper-V driver code.
 

alpine/kernel/patches/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch

@@ -1,7 +1,7 @@
-From c5716756f56e498fc463458cfab19bb071f35469 Mon Sep 17 00:00:00 2001
+From 9ae0af317c2a085434b46197a663165895decaf6 Mon Sep 17 00:00:00 2001
 From: "K. Y. Srinivasan" <kys@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:44 -0800
-Subject: [PATCH 17/45] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing
+Subject: [PATCH 18/46] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing
  GUIDs
 
 Use uuid_le_cmp() for comparing GUIDs.

alpine/kernel/patches/0019-Drivers-hv-vmbus-serialize-process_chn_event-and-vmb.patch

@@ -1,7 +1,7 @@
-From fb0f783a35e7a0a9e8560fe5809b824bc1c8f8a8 Mon Sep 17 00:00:00 2001
+From 5c3a0d077f4c0ecd17117c04b0b6fef7e8acbdea Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:47 -0800
-Subject: [PATCH 18/45] Drivers: hv: vmbus: serialize process_chn_event() and
+Subject: [PATCH 19/46] Drivers: hv: vmbus: serialize process_chn_event() and
  vmbus_close_internal()
 
 process_chn_event(), running in the tasklet, can race with

alpine/kernel/patches/0020-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch

@@ -1,7 +1,7 @@
-From 47057c1030e6a0e9ebd52e8268bb0fd7c6a3020c Mon Sep 17 00:00:00 2001
+From 8bba0d5b705be1f1d0bdfe7fa8465042fa936c3c Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:48 -0800
-Subject: [PATCH 19/45] Drivers: hv: vmbus: do sanity check of channel state in
+Subject: [PATCH 20/46] Drivers: hv: vmbus: do sanity check of channel state in
  vmbus_close_internal()
 
 This fixes an incorrect assumption of channel state in the function.

alpine/kernel/patches/0021-Drivers-hv-vmbus-fix-rescind-offer-handling-for-devi.patch

@@ -1,7 +1,7 @@
-From 67631d9308a4405dfb219c287b3ec1d152946584 Mon Sep 17 00:00:00 2001
+From 4185d167c4c6db493a3e96e59689e32562761563 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:49 -0800
-Subject: [PATCH 20/45] Drivers: hv: vmbus: fix rescind-offer handling for
+Subject: [PATCH 21/46] Drivers: hv: vmbus: fix rescind-offer handling for
  device without a driver
 
 In the path vmbus_onoffer_rescind() -> vmbus_device_unregister()  ->

alpine/kernel/patches/0022-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch

@@ -1,7 +1,7 @@
-From 566fc2785f6bced720caae03060cadcb43faec0b Mon Sep 17 00:00:00 2001
+From 667defbc25ef5dcfa89b60c0bd534d5a27f8c116 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:50 -0800
-Subject: [PATCH 21/45] Drivers: hv: vmbus: release relid on error in
+Subject: [PATCH 22/46] Drivers: hv: vmbus: release relid on error in
  vmbus_process_offer()
 
 We want to simplify vmbus_onoffer_rescind() by not invoking

alpine/kernel/patches/0023-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch

@@ -1,7 +1,7 @@
-From abf8e10f0d5db38d8fbe6df7d1a680162f8d3ffa Mon Sep 17 00:00:00 2001
+From 235e2935d2d0700ac21db0cb0d6a64d6f9ff09fa Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 14 Dec 2015 16:01:51 -0800
-Subject: [PATCH 22/45] Drivers: hv: vmbus: channge
+Subject: [PATCH 23/46] Drivers: hv: vmbus: channge
  vmbus_connection.channel_lock to mutex
 
 spinlock is unnecessary here.

alpine/kernel/patches/0024-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch

@@ -1,7 +1,7 @@
-From 4f9c87c89627ceae3958099a853e65bac51d2491 Mon Sep 17 00:00:00 2001
+From d6cc8615d22926bb1e2d8ba85fd391df9f1cf089 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Mon, 14 Dec 2015 19:02:00 -0800
-Subject: [PATCH 23/45] Drivers: hv: remove code duplication between
+Subject: [PATCH 24/46] Drivers: hv: remove code duplication between
  vmbus_recvpacket()/vmbus_recvpacket_raw()
 
 vmbus_recvpacket() and vmbus_recvpacket_raw() are almost identical but

alpine/kernel/patches/0025-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch

@@ -1,7 +1,7 @@
-From 172dc2c2f9a6536990de55c4dabfd71ba62833f8 Mon Sep 17 00:00:00 2001
+From 64c112c50e6a404431f5adc7685915cd9b5e8d42 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 21 Dec 2015 12:21:22 -0800
-Subject: [PATCH 24/45] Drivers: hv: vmbus: fix the building warning with
+Subject: [PATCH 25/46] Drivers: hv: vmbus: fix the building warning with
  hyperv-keyboard
 
 With the recent change af3ff643ea91ba64dd8d0b1cbed54d44512f96cd

alpine/kernel/patches/0026-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch

@@ -1,7 +1,7 @@
-From de9460b1d17a51ab2b3a1811ae3992fec7e15ca2 Mon Sep 17 00:00:00 2001
+From 6ee99ea70b9975b03c436c05a55c154bed392a94 Mon Sep 17 00:00:00 2001
 From: "K. Y. Srinivasan" <kys@microsoft.com>
 Date: Tue, 15 Dec 2015 16:27:27 -0800
-Subject: [PATCH 25/45] Drivers: hv: vmbus: Treat Fibre Channel devices as
+Subject: [PATCH 26/46] Drivers: hv: vmbus: Treat Fibre Channel devices as
  performance critical
 
 For performance critical devices, we distribute the incoming

alpine/kernel/patches/0027-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch

@@ -1,7 +1,7 @@
-From 2b8233468015c17304c8205eb16f798a9334155e Mon Sep 17 00:00:00 2001
+From 5131dc31aecd376785b71bb3bb16bf70573682b3 Mon Sep 17 00:00:00 2001
 From: "K. Y. Srinivasan" <kys@microsoft.com>
 Date: Fri, 25 Dec 2015 20:00:30 -0800
-Subject: [PATCH 26/45] Drivers: hv: vmbus: Add vendor and device atttributes
+Subject: [PATCH 27/46] Drivers: hv: vmbus: Add vendor and device atttributes
 
 Add vendor and device attributes to VMBUS devices. These will be used
 by Hyper-V tools as well user-level RDMA libraries that will use the

alpine/kernel/patches/0028-Drivers-hv-vmbus-avoid-infinite-loop-in-init_vp_inde.patch

@@ -1,7 +1,7 @@
-From 6a01db640f2950f33a51bc4549058d491c8d1314 Mon Sep 17 00:00:00 2001
+From 2dd3d37c7e1a4ce1adeb2a4af3df878907d44ebe Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Wed, 27 Jan 2016 22:29:34 -0800
-Subject: [PATCH 27/45] Drivers: hv: vmbus: avoid infinite loop in
+Subject: [PATCH 28/46] Drivers: hv: vmbus: avoid infinite loop in
  init_vp_index()
 
 When we pick a CPU to use for a new subchannel we try find a non-used one

alpine/kernel/patches/0029-Drivers-hv-vmbus-avoid-scheduling-in-interrupt-conte.patch

@@ -1,7 +1,7 @@
-From 798509ab822925cc9bbe9b3f7d56ceb5869aa61c Mon Sep 17 00:00:00 2001
+From f478bef9bcd76c17c338c7c96422f22dad0d02e3 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Wed, 27 Jan 2016 22:29:35 -0800
-Subject: [PATCH 28/45] Drivers: hv: vmbus: avoid scheduling in interrupt
+Subject: [PATCH 29/46] Drivers: hv: vmbus: avoid scheduling in interrupt
  context in vmbus_initiate_unload()
 
 We have to call vmbus_initiate_unload() on crash to make kdump work but

alpine/kernel/patches/0030-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch

@@ -1,7 +1,7 @@
-From 1cea598f33747f6f221600e4135fa1c7eb0339b3 Mon Sep 17 00:00:00 2001
+From 1686f700609459bc6cf9d4597a8a39bf5f133409 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:37 -0800
-Subject: [PATCH 29/45] Drivers: hv: vmbus: add a helper function to set a
+Subject: [PATCH 30/46] Drivers: hv: vmbus: add a helper function to set a
  channel's pending send size
 
 This will be used by the coming net/hvsock driver.

alpine/kernel/patches/0031-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch

@@ -1,7 +1,7 @@
-From 484e9fa916f11b145201a8473142977d260f924a Mon Sep 17 00:00:00 2001
+From f22a67d17cb1f357da61258ee181729bcf0af3b1 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:38 -0800
-Subject: [PATCH 30/45] Drivers: hv: vmbus: define the new offer type for
+Subject: [PATCH 31/46] Drivers: hv: vmbus: define the new offer type for
  Hyper-V socket (hvsock)
 
 A helper function is also added.

alpine/kernel/patches/0032-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch

@@ -1,7 +1,7 @@
-From e076eff3df2c5592ca711a0f3b9665ee9a9981c7 Mon Sep 17 00:00:00 2001
+From 6d465cc94028d9c3b7e36996b09e7c9d95b269f3 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:39 -0800
-Subject: [PATCH 31/45] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid
+Subject: [PATCH 32/46] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid
  unnecessary signaling
 
 When the hvsock channel's outbound ringbuffer is full (i.e.,

alpine/kernel/patches/0033-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch

@@ -1,7 +1,7 @@
-From ef0c006df50c1a0f91827f2f84bb0936952e1361 Mon Sep 17 00:00:00 2001
+From 7a337a1dcbdcb4c5ab22822f5cbf5b5fbe45551c Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:40 -0800
-Subject: [PATCH 32/45] Drivers: hv: vmbus: define a new VMBus message type for
+Subject: [PATCH 33/46] Drivers: hv: vmbus: define a new VMBus message type for
  hvsock
 
 A function to send the type of message is also added.

alpine/kernel/patches/0034-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch

@@ -1,7 +1,7 @@
-From 8271769466aa4286ad5fe29e7bddc85701965314 Mon Sep 17 00:00:00 2001
+From 6a067b8e07452ec14629bea5bfe0951877c27451 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:41 -0800
-Subject: [PATCH 33/45] Drivers: hv: vmbus: add a hvsock flag in struct
+Subject: [PATCH 34/46] Drivers: hv: vmbus: add a hvsock flag in struct
  hv_driver
 
 Only the coming hv_sock driver has a "true" value for this flag.

alpine/kernel/patches/0035-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch

@@ -1,7 +1,7 @@
-From 810c87d25aae195016a8d3a90aa3cf7258e2c7cc Mon Sep 17 00:00:00 2001
+From e8bf64d13b450b3a224bd12779c38931e4a5691d Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:42 -0800
-Subject: [PATCH 34/45] Drivers: hv: vmbus: add a per-channel rescind callback
+Subject: [PATCH 35/46] Drivers: hv: vmbus: add a per-channel rescind callback
 
 This will be used by the coming hv_sock driver.
 

alpine/kernel/patches/0036-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch

@@ -1,7 +1,7 @@
-From b20109841eac978453e3514b51fb93aa292ece09 Mon Sep 17 00:00:00 2001
+From b27d9192ab78946005526ee9574bc971b69205a2 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:43 -0800
-Subject: [PATCH 35/45] Drivers: hv: vmbus: add an API
+Subject: [PATCH 36/46] Drivers: hv: vmbus: add an API
  vmbus_hvsock_device_unregister()
 
 The hvsock driver needs this API to release all the resources related

alpine/kernel/patches/0037-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch

@@ -1,7 +1,7 @@
-From b6ad0bd0eb97a4704e3e4f857282f41dfc8a08d8 Mon Sep 17 00:00:00 2001
+From d5f89659d3c0c5e05c3a76c3cc1b84aa505bc06e Mon Sep 17 00:00:00 2001
 From: "K. Y. Srinivasan" <kys@microsoft.com>
 Date: Wed, 27 Jan 2016 22:29:45 -0800
-Subject: [PATCH 36/45] Drivers: hv: vmbus: Give control over how the ring
+Subject: [PATCH 37/46] Drivers: hv: vmbus: Give control over how the ring
  access is serialized
 
 On the channel send side, many of the VMBUS

alpine/kernel/patches/0038-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch

@@ -1,7 +1,7 @@
-From f465de8d2676b9f125255e8f3eec5e631d07d60e Mon Sep 17 00:00:00 2001
+From f565fcc8decc0d57427b8506ea4b430de70440b1 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Fri, 26 Feb 2016 15:13:16 -0800
-Subject: [PATCH 37/45] Drivers: hv: vmbus: avoid wait_for_completion() on
+Subject: [PATCH 38/46] Drivers: hv: vmbus: avoid wait_for_completion() on
  crash
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

alpine/kernel/patches/0039-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch

@@ -1,7 +1,7 @@
-From d7b1742f30b68fae9c0bd627704106f7665c30ed Mon Sep 17 00:00:00 2001
+From 0b4365983ef397e8b43f9f77e591c4c9f83fca26 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Fri, 26 Feb 2016 15:13:18 -0800
-Subject: [PATCH 38/45] Drivers: hv: vmbus: avoid unneeded compiler
+Subject: [PATCH 39/46] Drivers: hv: vmbus: avoid unneeded compiler
  optimizations in vmbus_wait_for_unload()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

alpine/kernel/patches/0040-kcm-Kernel-Connection-Multiplexor-module.patch

@@ -1,7 +1,7 @@
-From 556c8b33b1690096d9b216184b0c892e058e8d76 Mon Sep 17 00:00:00 2001
+From f3d84d9ee57ed72603ea8334302c2ed2971882b9 Mon Sep 17 00:00:00 2001
 From: Tom Herbert <tom@herbertland.com>
 Date: Mon, 7 Mar 2016 14:11:06 -0800
-Subject: [PATCH 39/45] kcm: Kernel Connection Multiplexor module
+Subject: [PATCH 40/46] kcm: Kernel Connection Multiplexor module
 
 This module implements the Kernel Connection Multiplexor.
 

alpine/kernel/patches/0041-net-add-the-AF_KCM-entries-to-family-name-tables.patch

@@ -1,7 +1,7 @@
-From d3f41a6e22aecae1e0502dadc7ff1847f9b64af0 Mon Sep 17 00:00:00 2001
+From d436f250cb94cdc0f8ceb18c73e641f8285f2c87 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 21 Mar 2016 02:51:09 -0700
-Subject: [PATCH 40/45] net: add the AF_KCM entries to family name tables
+Subject: [PATCH 41/46] net: add the AF_KCM entries to family name tables
 
 This is for the recent kcm driver, which introduces AF_KCM(41) in
 b7ac4eb(kcm: Kernel Connection Multiplexor module).

alpine/kernel/patches/0042-net-Add-Qualcomm-IPC-router.patch

@@ -1,7 +1,7 @@
-From 8d3d67fb44d8d9b44b9923d1cbddf9285b9b68ae Mon Sep 17 00:00:00 2001
+From 550437ba0f633b470b719d981110cbd38a4a83c4 Mon Sep 17 00:00:00 2001
 From: Courtney Cavin <courtney.cavin@sonymobile.com>
 Date: Wed, 27 Apr 2016 12:13:03 -0700
-Subject: [PATCH 41/45] net: Add Qualcomm IPC router
+Subject: [PATCH 42/46] net: Add Qualcomm IPC router
 
 Add an implementation of Qualcomm's IPC router protocol, used to
 communicate with service providing remote processors.

alpine/kernel/patches/0043-hv_sock-introduce-Hyper-V-Sockets.patch

@@ -1,7 +1,7 @@
-From 9d627b917f9bf189f938e30fe4c6b11c241e204e Mon Sep 17 00:00:00 2001
+From 87e2463282f0dc46f866cce2efd5cb36eb964bdb Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Sun, 15 May 2016 09:53:11 -0700
-Subject: [PATCH 42/45] hv_sock: introduce Hyper-V Sockets
+Subject: [PATCH 43/46] hv_sock: introduce Hyper-V Sockets
 
 Hyper-V Sockets (hv_sock) supplies a byte-stream based communication
 mechanism between the host and the guest. It's somewhat like TCP over

alpine/kernel/patches/0044-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch

@@ -1,7 +1,7 @@
-From 0436560566688b27d0a1f505481b2bb3b738888e Mon Sep 17 00:00:00 2001
+From d3aac2768b413cea5e281290dfe236d7531638ad Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Mon, 21 Mar 2016 02:53:08 -0700
-Subject: [PATCH 43/45] net: add the AF_HYPERV entries to family name tables
+Subject: [PATCH 44/46] net: add the AF_HYPERV entries to family name tables
 
 This is for the hv_sock driver, which introduces AF_HYPERV(42).
 

alpine/kernel/patches/0045-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch

@@ -1,7 +1,7 @@
-From 2fdbef30e06e66b0de2ddc9a424db56501cf546b Mon Sep 17 00:00:00 2001
+From 56e767526878b2fc79b0dfaa2860ed2ae836a52e Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Sat, 21 May 2016 16:55:50 +0800
-Subject: [PATCH 44/45] Drivers: hv: vmbus: fix the race when querying &
+Subject: [PATCH 45/46] Drivers: hv: vmbus: fix the race when querying &
  updating the percpu list
 
 There is a rare race when we remove an entry from the global list

alpine/kernel/patches/0046-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch

@@ -1,7 +1,7 @@
-From 24c21ccb6524b1ecff1ff47ef8b39375b763d79f Mon Sep 17 00:00:00 2001
+From 44694d7a14f502c9222ea100ab62fa7030acf548 Mon Sep 17 00:00:00 2001
 From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
 Date: Mon, 23 May 2016 18:55:45 +0100
-Subject: [PATCH 45/45] vmbus: Don't spam the logs with unknown GUIDs
+Subject: [PATCH 46/46] vmbus: Don't spam the logs with unknown GUIDs
 
 With Hyper-V sockets device types are introduced on the fly. The pr_info()
 then prints a message on every connection, which is way too verbose.  Since