mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-20 17:49:10 +00:00
Merge pull request #2467 from rn/kern-up2
Update kernels to 4.12.9/4.9.45/4.9.46/4.4.84/4.4.85
This commit is contained in:
Rolf Neugebauer
GitHub
commit
fe1aa4659c
@ -1,6 +1,6 @@
|
||||
# This is a blueprint for building the open source components of Docker for Mac
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS1"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Minimal YAML to run a redis server (used at DockerCon'17)
|
||||
# connect: nc localhost 6379
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -119,11 +119,16 @@ show-tags: show-tag_$(2)$(3)
|
||||
fetch: sources/linux-$(1).tar.xz
|
||||
|
||||
ifneq ($(2), 4.4.x)
|
||||
# 'docker build' with the FROM image supplied as --build-arg
|
||||
# *and* with DOCKER_CONTENT_TRUST=1 currently does not work
|
||||
# (https://github.com/moby/moby/issues/34199). So, we pull the image
|
||||
# with DCT and then build with DOCKER_CONTENT_TRUST explicitly set to 0.
|
||||
build_perf_$(2)$(3): build_$(2)$(3)
|
||||
docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) || \
|
||||
docker build -f Dockerfile.perf \
|
||||
(docker pull $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) && \
|
||||
DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \
|
||||
--build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \
|
||||
--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) .
|
||||
--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) .)
|
||||
|
||||
push_perf_$(2)$(3): build_perf_$(2)$(3)
|
||||
@if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
|
||||
@ -144,11 +149,11 @@ endef
|
||||
# Build Targets
|
||||
# Debug targets only for latest stable and LTS stable
|
||||
#
|
||||
$(eval $(call kernel,4.12.8,4.12.x,$(EXTRA)))
|
||||
$(eval $(call kernel,4.12.8,4.12.x,-dbg))
|
||||
$(eval $(call kernel,4.9.44,4.9.x,$(EXTRA)))
|
||||
$(eval $(call kernel,4.9.44,4.9.x,-dbg))
|
||||
$(eval $(call kernel,4.4.83,4.4.x,$(EXTRA)))
|
||||
$(eval $(call kernel,4.12.9,4.12.x,$(EXTRA)))
|
||||
$(eval $(call kernel,4.12.9,4.12.x,-dbg))
|
||||
$(eval $(call kernel,4.9.46,4.9.x,$(EXTRA)))
|
||||
$(eval $(call kernel,4.9.46,4.9.x,-dbg))
|
||||
$(eval $(call kernel,4.4.85,4.4.x,$(EXTRA)))
|
||||
|
||||
# Target for kernel config
|
||||
kconfig: | sources
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 4.12.8 Kernel Configuration
|
||||
# Linux/arm64 4.12.9 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.12.8 Kernel Configuration
|
||||
# Linux/x86 4.12.9 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -3545,6 +3545,7 @@ CONFIG_DEBUG_FS=y
|
||||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_SECTION_MISMATCH is not set
|
||||
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
||||
CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
|
||||
CONFIG_ARCH_WANT_FRAME_POINTERS=y
|
||||
# CONFIG_FRAME_POINTER is not set
|
||||
# CONFIG_STACK_VALIDATION is not set
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 4.4.83 Kernel Configuration
|
||||
# Linux/arm64 4.4.85 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.4.83 Kernel Configuration
|
||||
# Linux/x86 4.4.85 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 4.9.44 Kernel Configuration
|
||||
# Linux/arm64 4.9.46 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.9.44 Kernel Configuration
|
||||
# Linux/x86 4.9.46 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 516c2116aa11f4ea6cf09aa3a195951509d429ff Mon Sep 17 00:00:00 2001
|
||||
From 46f083de182fd968ea8ef5b821d35a3432b670b4 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:31:50 -0600
|
||||
Subject: [PATCH 01/15] vmbus: vmbus_open(): reset onchannel_callback on error
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7dfdecc1c016087532580bb9a51e19fd2af4136d Mon Sep 17 00:00:00 2001
|
||||
From 4c89601836aa5ad7418d9feb78d67f8c9a831002 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:31:53 -0600
|
||||
Subject: [PATCH 02/15] vmbus: remove "goto error_clean_msglist" in
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1854541966d93dc3e73deb8b262943781949e52d Mon Sep 17 00:00:00 2001
|
||||
From 2678c3683496099da91e7d5a84592cd74e0de631 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Fri, 5 May 2017 16:57:23 -0600
|
||||
Subject: [PATCH 03/15] vmbus: dynamically enqueue/dequeue a channel on
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e317beafc5bf9165f1f604d8c201bc0d09a884b5 Mon Sep 17 00:00:00 2001
|
||||
From 71945c7c14c7010b7fd0d13cdebf99b25a2e3d45 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:31:56 -0600
|
||||
Subject: [PATCH 04/15] hv_sock: implements Hyper-V transport for Virtual
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4250125671ac2be252badfff1783ab421ff9a360 Mon Sep 17 00:00:00 2001
|
||||
From 6572a16ec781e517afc8b3975547b2e0b8499a7a Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:31:58 -0600
|
||||
Subject: [PATCH 05/15] VMCI: only try to load on VMware hypervisor
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 3a056b90bb7e257e9edde271720a0676af9ae621 Mon Sep 17 00:00:00 2001
|
||||
From e2b50033a49dec6373f9b439c47019ad44cb84c2 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:32:00 -0600
|
||||
Subject: [PATCH 06/15] hv_sock: add the support of auto-loading
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 5375fe4bf172da12535c273ea0deec4970f3166f Mon Sep 17 00:00:00 2001
|
||||
From b0d1cd1d32899cd4b6547af4898f3fdad6324961 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:32:03 -0600
|
||||
Subject: [PATCH 07/15] hv_sock: fix a race in hvs_stream_dequeue()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From acb25be7f0f2379a7e1b656ce03543ab41d9cd86 Mon Sep 17 00:00:00 2001
|
||||
From 212b1a6dcdd6a6d52baa838af3f7dea9a206e47f Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:32:06 -0600
|
||||
Subject: [PATCH 08/15] vsock: fix vsock_dequeue/enqueue_accept race
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1cd7fb401154c625ae77aef8c6869b3f01b514f8 Mon Sep 17 00:00:00 2001
|
||||
From 4753fbdd9d9c53ee348c2ad2a5bbdce0daf55508 Mon Sep 17 00:00:00 2001
|
||||
From: "K. Y. Srinivasan" <kys@microsoft.com>
|
||||
Date: Sun, 30 Apr 2017 16:21:18 -0700
|
||||
Subject: [PATCH 09/15] Drivers: hv: vmbus: Fix rescind handling
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 12ded1f47ea422964fb8762f1fe7443bf97e067e Mon Sep 17 00:00:00 2001
|
||||
From e07d97ffd6c0c51cdd5919cd4f78005b92262885 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 5 Jun 2017 16:13:18 +0800
|
||||
Subject: [PATCH 10/15] vmbus: fix hv_percpu_channel_deq/enq race
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 98f32826ce5f2aad27b940e32a4c12199a934bab Mon Sep 17 00:00:00 2001
|
||||
From dfec35a68bca5a04439aac430f916b8a63709ef9 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 5 Jun 2017 21:32:00 +0800
|
||||
Subject: [PATCH 11/15] vmbus: add vmbus onoffer/onoffer_rescind sync.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 19fdaff8faea41153ced91768194c58804c232cf Mon Sep 17 00:00:00 2001
|
||||
From 78dbf27657668b70d2daf1376d7d9114d4d6b080 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 28 Jun 2017 23:50:38 +0800
|
||||
Subject: [PATCH 12/15] vmbus: fix the missed signaling in hv_signal_on_read()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 506b9c1e78a698217b918446ece7dbee08ae160f Mon Sep 17 00:00:00 2001
|
||||
From 5777c274a08f586f5f41e12912377a6ba72049b4 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 26 Jul 2017 12:32:08 -0600
|
||||
Subject: [PATCH 13/15] hv_sock: avoid double FINs if shutdown() is called
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 76ef98c66146a53c5367c60f2291761f40e33355 Mon Sep 17 00:00:00 2001
|
||||
From ddac1a1c344ac05ccfbe28f9044bffae856bb4c0 Mon Sep 17 00:00:00 2001
|
||||
From: Cheng-mean Liu <soccerl@microsoft.com>
|
||||
Date: Tue, 11 Jul 2017 16:50:36 -0700
|
||||
Subject: [PATCH 14/15] Added vsock transport support to 9pfs
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e1580d5ac40822f7f44ab4a95973b48cba8c9f63 Mon Sep 17 00:00:00 2001
|
||||
From 482c225fd4f5e40e04f2fe3f06185b5d39dab557 Mon Sep 17 00:00:00 2001
|
||||
From: Cheng-mean Liu <soccerl@microsoft.com>
|
||||
Date: Tue, 11 Jul 2017 16:58:26 -0700
|
||||
Subject: [PATCH 15/15] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 44b2cf72e27d12b5b35f9bcc247c7a3b7714c611 Mon Sep 17 00:00:00 2001
|
||||
From a6f4305e0280fd77f451c2e971a4de92d11b3521 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/44] virtio: make find_vqs() checkpatch.pl-friendly
|
||||
@ -215,5 +215,5 @@ index e5ce8ab0b8b0..6e6cb0c9d7cb 100644
|
||||
u64 (*get_features)(struct virtio_device *vdev);
|
||||
int (*finalize_features)(struct virtio_device *vdev);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 89757e2ac7e3ad686ef5891c6a5e202457081f11 Mon Sep 17 00:00:00 2001
|
||||
From ffef2b33dd5d476d868021f521929727b5bd039c 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/44] VSOCK: constify vmci_transport_notify_ops structures
|
||||
@ -73,5 +73,5 @@ index dc9c7929a2f9..21e591dafb03 100644
|
||||
vmci_transport_notify_pkt_socket_destruct,
|
||||
vmci_transport_notify_pkt_poll_in,
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From dc01e1d70da7835fedf37726881cd4737755fe1f Mon Sep 17 00:00:00 2001
|
||||
From 2437440fb2b15ee662bbd6525da9265cdf4d6cb4 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/44] AF_VSOCK: Shrink the area influenced by prepare_to_wait
|
||||
@ -332,5 +332,5 @@ index 9b5bd6d142dc..b5f1221f48d4 100644
|
||||
release_sock(sk);
|
||||
return err;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f7476a3046b4050ea3f993619c95099b39f623ea Mon Sep 17 00:00:00 2001
|
||||
From 72c82ea37b8c87fc3255f8e2b64467e29d0c5029 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/44] vsock: make listener child lock ordering explicit
|
||||
@ -59,5 +59,5 @@ index b5f1221f48d4..b96ac918e0ba 100644
|
||||
|
||||
/* If the listener socket has received an error, then we should
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f438b5e9962091fd9bc8c2e5236a31d374f50703 Mon Sep 17 00:00:00 2001
|
||||
From 857a7818daecb33ab323bdbde5904cb4a84562bd 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/44] VSOCK: transport-specific vsock_transport functions
|
||||
@ -55,5 +55,5 @@ index b96ac918e0ba..e34d96f8bde2 100644
|
||||
MODULE_DESCRIPTION("VMware Virtual Socket Family");
|
||||
MODULE_VERSION("1.0.1.0-k");
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d4ddcbfd024ba56deb6f56ec27b3944564e7ceef Mon Sep 17 00:00:00 2001
|
||||
From 70e1784588eb3419302e2c2624113f26e1909fa7 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/44] VSOCK: defer sock removal to transports
|
||||
@ -79,5 +79,5 @@ index 662bdd20a748..5f8c99eb104c 100644
|
||||
vmci_datagram_destroy_handle(vmci_trans(vsk)->dg_handle);
|
||||
vmci_trans(vsk)->dg_handle = VMCI_INVALID_HANDLE;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7a3561525df92f9c3f041668f1d37c3fa7ee9e6b Mon Sep 17 00:00:00 2001
|
||||
From 3343045f1118cd74301ec14fefb6c4e2e5729f29 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/44] VSOCK: Introduce virtio_vsock_common.ko
|
||||
@ -1492,5 +1492,5 @@ index 000000000000..a53b3a16b4f1
|
||||
+MODULE_AUTHOR("Asias He");
|
||||
+MODULE_DESCRIPTION("common code for virtio vsock");
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b0119a63f0845ea9faa2a7c1b78796f5fbd9c97a Mon Sep 17 00:00:00 2001
|
||||
From b6536ff2cd16ff2d262173f1c20d5f57283bc00f 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/44] VSOCK: Introduce virtio_transport.ko
|
||||
@ -659,5 +659,5 @@ index 000000000000..699dfabdbccd
|
||||
+MODULE_DESCRIPTION("virtio transport for vsock");
|
||||
+MODULE_DEVICE_TABLE(virtio, id_table);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1e03ef38ad4721d0acc641679b90b249da111ebd Mon Sep 17 00:00:00 2001
|
||||
From 83c8618c5b60fa732decdf6f066ef1f7bf2e69e3 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/44] VSOCK: Introduce vhost_vsock.ko
|
||||
@ -773,5 +773,5 @@ index ab3731917bac..b30647697774 100644
|
||||
+
|
||||
#endif
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From da5404c28b7f61378376f832ea9b61c9840eb6de Mon Sep 17 00:00:00 2001
|
||||
From 0eb00968941264eb6ca1d8351a924d61fb1c6e2f 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/44] VSOCK: Add Makefile and Kconfig
|
||||
@ -102,5 +102,5 @@ index 2ce52d70f224..bc27c70e0e59 100644
|
||||
+
|
||||
+vmw_vsock_virtio_transport_common-y += virtio_transport_common.o
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d2682d3fdeb150b7d12fd574eeee624b9f56dbbe Mon Sep 17 00:00:00 2001
|
||||
From 3e78d07c80589c7bd4ced1d1319acbcfda5eff3e 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/44] VSOCK: Use kvfree()
|
||||
@ -29,5 +29,5 @@ index 028ca16c2d36..0ddf3a2dbfc4 100644
|
||||
|
||||
static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 714f0b6e56b4c6703bdde24cf35c29258554c9f9 Mon Sep 17 00:00:00 2001
|
||||
From 349eb6796389c91ac5d1b6f263de27221f64b9f7 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Thu, 4 Aug 2016 14:52:53 +0100
|
||||
Subject: [PATCH 12/44] vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
|
||||
@ -49,5 +49,5 @@ index 0ddf3a2dbfc4..e3b30ea9ece5 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 89dbd07b75b486df3b49fe99badc837dc52e15ea Mon Sep 17 00:00:00 2001
|
||||
From 0d8b0d165bf743a257c2d1be1a90594c24655a93 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Fri, 5 Aug 2016 13:52:09 +0100
|
||||
Subject: [PATCH 13/44] virtio-vsock: fix include guard typo
|
||||
@ -24,5 +24,5 @@ index 6b011c19b50f..1d57ed3d84d2 100644
|
||||
#include <linux/types.h>
|
||||
#include <linux/virtio_ids.h>
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 610b73f93bed3fb6b34f1959be79aebf32cd08bf Mon Sep 17 00:00:00 2001
|
||||
From ea39240884fe4a2d5cdf42ede45caa14c45dbc5a 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 14/44] vhost/vsock: drop space available check for TX vq
|
||||
@ -57,5 +57,5 @@ index 699dfabdbccd..936d7eee62d0 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f444772857006461d359ee9a188a026f8bd11b33 Mon Sep 17 00:00:00 2001
|
||||
From 287efffd5d6627072e55d693adda220a8f03a95e 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 15/44] VSOCK: Only allow host network namespace to use
|
||||
@ -27,5 +27,5 @@ index 17dbbe64cd73..1bb1b016e945 100644
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1c9f457285615b12fd3383b9675c39e91639bf56 Mon Sep 17 00:00:00 2001
|
||||
From 2405ec3f5163d5b09e1594b97d03a4ab7cdd3293 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Oshins <jakeo@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:41 -0800
|
||||
Subject: [PATCH 16/44] drivers:hv: Define the channel type for Hyper-V PCI
|
||||
@ -40,10 +40,11 @@ diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
||||
index ae6a711dcd1d..10dda1e3b560 100644
|
||||
--- a/include/linux/hyperv.h
|
||||
+++ b/include/linux/hyperv.h
|
||||
@@ -1156,6 +1156,17 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
||||
@@ -1155,6 +1155,17 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
||||
0xab, 0x99, 0xbd, 0x1f, 0x1c, 0x86, 0xb5, 0x01 \
|
||||
}
|
||||
|
||||
/*
|
||||
+/*
|
||||
+ * PCI Express Pass Through
|
||||
+ * {44C4F61D-4444-4400-9D52-802E27EDE19F}
|
||||
+ */
|
||||
@ -54,10 +55,9 @@ index ae6a711dcd1d..10dda1e3b560 100644
|
||||
+ 0x9D, 0x52, 0x80, 0x2E, 0x27, 0xED, 0xE1, 0x9F \
|
||||
+ }
|
||||
+
|
||||
+/*
|
||||
/*
|
||||
* Common header for Hyper-V ICs
|
||||
*/
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a8db0d91baf9dc56978aaffbbf66cf19f104ed7d Mon Sep 17 00:00:00 2001
|
||||
From 57e28df85fa0b44ceb794fe4d6897eef95a3f8f9 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 17/44] Drivers: hv: vmbus: Use uuid_le type consistently
|
||||
@ -293,5 +293,5 @@ index 9f5cdd49ff0b..8e8c69bee78f 100644
|
||||
strcpy(alias, "vmbus:");
|
||||
strcat(alias, guid_name);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f71c383a601d269aec7dba3ca2ee6296c825c095 Mon Sep 17 00:00:00 2001
|
||||
From ecde22060d79439853841b3a2acb8f032c65892a 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 18/44] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing
|
||||
@ -51,5 +51,5 @@ index f1fbb6b98f5c..e71f3561dbab 100644
|
||||
|
||||
return NULL;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1f3e2839a8f6eacb0f5fdf570613b7856f2b4657 Mon Sep 17 00:00:00 2001
|
||||
From 9e4fb17fcdaca436f0e219c446009276ec37a67d 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/44] Drivers: hv: vmbus: do sanity check of channel state in
|
||||
@ -38,5 +38,5 @@ index d037454fe7b8..b00cdfb725de 100644
|
||||
channel->sc_creation_callback = NULL;
|
||||
/* Stop callback and cancel the timer asap */
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9d0a5d2caf0833d74ac824530e0ec82ac701e85f Mon Sep 17 00:00:00 2001
|
||||
From a82cc6df5c47e839dc40b57e00c5a6ab7daa6040 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:50 -0800
|
||||
Subject: [PATCH 20/44] Drivers: hv: vmbus: release relid on error in
|
||||
@ -70,5 +70,5 @@ index 9b4525c56376..8529dd2ebc3d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 47d29e70b03db8f41207485a40daa6b12436ce13 Mon Sep 17 00:00:00 2001
|
||||
From 5dbc7d473ac1c203057b141c54371245e3a90b89 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 14 Dec 2015 16:01:51 -0800
|
||||
Subject: [PATCH 21/44] Drivers: hv: vmbus: channge
|
||||
@ -112,5 +112,5 @@ index 75e383e6d03d..9a95beb87015 100644
|
||||
struct workqueue_struct *work_queue;
|
||||
};
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7b98c8e1778122bbaa078ccc81bfd58c5e34ae05 Mon Sep 17 00:00:00 2001
|
||||
From f879b7cb85fa3cc8efc576ecfd4eec9631178ec5 Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Mon, 14 Dec 2015 19:02:00 -0800
|
||||
Subject: [PATCH 22/44] Drivers: hv: remove code duplication between
|
||||
@ -122,5 +122,5 @@ index b00cdfb725de..def21d34f3ea 100644
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vmbus_recvpacket_raw);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 691946e35a594847b85f8de3214ae513c4028601 Mon Sep 17 00:00:00 2001
|
||||
From 4506804ea13ae320e74a4adc4a9fcb11d2d0673c Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 21 Dec 2015 12:21:22 -0800
|
||||
Subject: [PATCH 23/44] Drivers: hv: vmbus: fix the building warning with
|
||||
@ -52,10 +52,11 @@ diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
||||
index 4712d7d07b8c..9e2de6a7cc96 100644
|
||||
--- a/include/linux/hyperv.h
|
||||
+++ b/include/linux/hyperv.h
|
||||
@@ -1091,6 +1091,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
||||
@@ -1090,6 +1090,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
||||
.guid = UUID_LE(0xcfa8b69e, 0x5b4a, 0x4cc0, 0xb9, 0x8b, \
|
||||
0x8b, 0xa1, 0xa1, 0xf3, 0xf9, 0x5a)
|
||||
|
||||
/*
|
||||
+/*
|
||||
+ * Keyboard GUID
|
||||
+ * {f912ad6d-2b17-48ea-bd65-f927a61c7684}
|
||||
+ */
|
||||
@ -63,10 +64,9 @@ index 4712d7d07b8c..9e2de6a7cc96 100644
|
||||
+ .guid = UUID_LE(0xf912ad6d, 0x2b17, 0x48ea, 0xbd, 0x65, \
|
||||
+ 0xf9, 0x27, 0xa6, 0x1c, 0x76, 0x84)
|
||||
+
|
||||
+/*
|
||||
/*
|
||||
* VSS (Backup/Restore) GUID
|
||||
*/
|
||||
#define HV_VSS_GUID \
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1e60eb703f0342fc920abab2d4c55ce928a148ee Mon Sep 17 00:00:00 2001
|
||||
From d3565a7cbfc2d53d4e0c82555049e01678216eff 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 24/44] Drivers: hv: vmbus: Treat Fibre Channel devices as
|
||||
@ -38,5 +38,5 @@ index 306c7dff6c77..763d0c19c16f 100644
|
||||
{ HV_NIC_GUID, },
|
||||
/* NetworkDirect Guest RDMA */
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 22e096ccd45adaff6eef63b43cb7fabc2b0f2a5d Mon Sep 17 00:00:00 2001
|
||||
From 933273468e8c74b2a02d980c595e4cd8c4f87240 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 25/44] Drivers: hv: vmbus: Add vendor and device atttributes
|
||||
@ -351,5 +351,5 @@ index 9e2de6a7cc96..51c98fd6044d 100644
|
||||
struct device device;
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6e00e9e0ccf36350d2cbddbee36a637333a250a6 Mon Sep 17 00:00:00 2001
|
||||
From ce82b43fda64cda36b320d87200f755806446fcb Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:37 -0800
|
||||
Subject: [PATCH 26/44] Drivers: hv: vmbus: add a helper function to set a
|
||||
@ -32,5 +32,5 @@ index 51c98fd6044d..934542ac1394 100644
|
||||
|
||||
int vmbus_request_offers(void);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d35681525ba8636d6ff301ae2b3e4e82b7f6630b Mon Sep 17 00:00:00 2001
|
||||
From 1b3eaafaa172b0c0699709a2f0dc5edf37366d18 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:38 -0800
|
||||
Subject: [PATCH 27/44] Drivers: hv: vmbus: define the new offer type for
|
||||
@ -40,5 +40,5 @@ index 934542ac1394..a4f105d55881 100644
|
||||
enum hv_signal_policy policy)
|
||||
{
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 5253e18d2062265d674c15410132a3aa3ba96362 Mon Sep 17 00:00:00 2001
|
||||
From 472156d278e915300e178cd29a7a5fdec7d39071 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:39 -0800
|
||||
Subject: [PATCH 28/44] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid
|
||||
@ -41,5 +41,5 @@ index def21d34f3ea..a42104ed0b59 100644
|
||||
|
||||
return ret;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b850a4f47f66bd1e0b5e4899db7b4f44a46f39eb Mon Sep 17 00:00:00 2001
|
||||
From cf0f206d7ab3290d730d70a51393e76d659e4dab Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:40 -0800
|
||||
Subject: [PATCH 29/44] Drivers: hv: vmbus: define a new VMBus message type for
|
||||
@ -97,5 +97,5 @@ index a4f105d55881..191bc5d0ffbf 100644
|
||||
+ const uuid_le *shv_host_servie_id);
|
||||
#endif /* _HYPERV_H */
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c98f401a711a19b179859024b3e7b5f14b6fd244 Mon Sep 17 00:00:00 2001
|
||||
From d5d6e9b507e4cee5774bd25f3a349de7dd903e49 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:41 -0800
|
||||
Subject: [PATCH 30/44] Drivers: hv: vmbus: add a hvsock flag in struct
|
||||
@ -60,5 +60,5 @@ index 191bc5d0ffbf..05966e279ec8 100644
|
||||
uuid_le dev_type;
|
||||
const struct hv_vmbus_device_id *id_table;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d44ad67698bc6870fa22d56cb92f5d4e0dceab6c Mon Sep 17 00:00:00 2001
|
||||
From c8df1c0d147024e9431555b0e9720c81a1a9a6d6 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:42 -0800
|
||||
Subject: [PATCH 31/44] Drivers: hv: vmbus: add a per-channel rescind callback
|
||||
@ -44,19 +44,19 @@ diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
|
||||
index 05966e279ec8..ad04017ba06f 100644
|
||||
--- a/include/linux/hyperv.h
|
||||
+++ b/include/linux/hyperv.h
|
||||
@@ -768,6 +768,12 @@ struct vmbus_channel {
|
||||
@@ -767,6 +767,12 @@ struct vmbus_channel {
|
||||
*/
|
||||
void (*sc_creation_callback)(struct vmbus_channel *new_sc);
|
||||
|
||||
/*
|
||||
+ /*
|
||||
+ * Channel rescind callback. Some channels (the hvsock ones), need to
|
||||
+ * register a callback which is invoked in vmbus_onoffer_rescind().
|
||||
+ */
|
||||
+ void (*chn_rescind_callback)(struct vmbus_channel *channel);
|
||||
+
|
||||
+ /*
|
||||
/*
|
||||
* The spinlock to protect the structure. It is being used to protect
|
||||
* test-and-set access to various attributes of the structure as well
|
||||
* as all sc_list operations.
|
||||
@@ -853,6 +859,9 @@ int vmbus_request_offers(void);
|
||||
void vmbus_set_sc_create_callback(struct vmbus_channel *primary_channel,
|
||||
void (*sc_cr_cb)(struct vmbus_channel *new_sc));
|
||||
@ -68,5 +68,5 @@ index 05966e279ec8..ad04017ba06f 100644
|
||||
* Retrieve the (sub) channel on which to send an outgoing request.
|
||||
* When a primary channel has multiple sub-channels, we choose a
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 10a04d0dfdc6d86cc374f9d9bb6880f1af409a91 Mon Sep 17 00:00:00 2001
|
||||
From 53950b10d244fe38e19421ef88bb411ba42dfe3d Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 27 Jan 2016 22:29:43 -0800
|
||||
Subject: [PATCH 32/44] Drivers: hv: vmbus: add an API
|
||||
@ -149,5 +149,5 @@ index ad04017ba06f..993318a6d147 100644
|
||||
resource_size_t min, resource_size_t max,
|
||||
resource_size_t size, resource_size_t align,
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 35c55cc61e763e4783c6525db7b7f9a576e3dfac Mon Sep 17 00:00:00 2001
|
||||
From 3121f4506f592c753cb3810cd9fc85dca2c53ff5 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 33/44] Drivers: hv: vmbus: Give control over how the ring
|
||||
@ -204,5 +204,5 @@ index 993318a6d147..6c9695ef757e 100644
|
||||
{
|
||||
return !!(c->offermsg.offer.chn_flags &
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0fdc92cb657e80bd7e51942a0fe4507ce776e957 Mon Sep 17 00:00:00 2001
|
||||
From edb9a8c8d1199ddc65569ccc042816a4d4679cbb Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Fri, 26 Feb 2016 15:13:16 -0800
|
||||
Subject: [PATCH 34/44] Drivers: hv: vmbus: avoid wait_for_completion() on
|
||||
@ -96,5 +96,5 @@ index a220efc297c4..d9801855ad4e 100644
|
||||
* In crash handler we can't schedule synic cleanup for all CPUs,
|
||||
* doing the cleanup for current CPU only. This should be sufficient
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 158bbf64f85d453a56485ace98d5dae06469dc45 Mon Sep 17 00:00:00 2001
|
||||
From 3b3872af9271ed5c23ad8e5530c8c287a7dad5c9 Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Fri, 26 Feb 2016 15:13:18 -0800
|
||||
Subject: [PATCH 35/44] Drivers: hv: vmbus: avoid unneeded compiler
|
||||
@ -35,5 +35,5 @@ index f70e35278b94..c892db5df665 100644
|
||||
continue;
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2796bd61ee35644460361e1ec0ec2e607d5dd06c Mon Sep 17 00:00:00 2001
|
||||
From 0ab8491a58d88f1ebb6fb118c54a9d1ce1c85ded Mon Sep 17 00:00:00 2001
|
||||
From: Tom Herbert <tom@herbertland.com>
|
||||
Date: Mon, 7 Mar 2016 14:11:06 -0800
|
||||
Subject: [PATCH 36/44] kcm: Kernel Connection Multiplexor module
|
||||
@ -2308,5 +2308,5 @@ index 000000000000..649d246c6799
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS_NETPROTO(PF_KCM);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0f2c3a1eff2be5d012e0dc6e25ffc809f80921a8 Mon Sep 17 00:00:00 2001
|
||||
From a1f70843a68eb87cf1a8825ff462286556f40e55 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 21 Mar 2016 02:51:09 -0700
|
||||
Subject: [PATCH 37/44] net: add the AF_KCM entries to family name tables
|
||||
@ -48,5 +48,5 @@ index bd2fad27891e..ef337bf176f7 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 3bb0a169fbd89f5698f1989e57775f403ca14de8 Mon Sep 17 00:00:00 2001
|
||||
From a542cc96883295d0cffb47dd2dd75b8564ea567f 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 38/44] net: Add Qualcomm IPC router
|
||||
@ -1303,5 +1303,5 @@ index 000000000000..84ebce73aa23
|
||||
+MODULE_DESCRIPTION("Qualcomm IPC-Router SMD interface driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 78c7e1a73c6af95945542c6face4bcee9129fbe8 Mon Sep 17 00:00:00 2001
|
||||
From 2859073f57e612f5242ffb2b8829411d5a9b19f5 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sun, 15 May 2016 09:53:11 -0700
|
||||
Subject: [PATCH 39/44] hv_sock: introduce Hyper-V Sockets
|
||||
@ -1801,5 +1801,5 @@ index 000000000000..b91bd608bf39
|
||||
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
||||
+MODULE_LICENSE("Dual BSD/GPL");
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 02b994fbec42fea966c6e06b6eba099a3087cd9a Mon Sep 17 00:00:00 2001
|
||||
From 013cb588a5dc50e8f5a6be8b2573f92b08a80e98 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Mon, 21 Mar 2016 02:53:08 -0700
|
||||
Subject: [PATCH 40/44] net: add the AF_HYPERV entries to family name tables
|
||||
@ -45,5 +45,5 @@ index ef337bf176f7..1c5f0a2ef836 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6d875aaa888f453e2481b48f224f27f19f7a5df2 Mon Sep 17 00:00:00 2001
|
||||
From 20fc465d9027a0571dc4903321836ed0b957ec39 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sat, 21 May 2016 16:55:50 +0800
|
||||
Subject: [PATCH 41/44] Drivers: hv: vmbus: fix the race when querying &
|
||||
@ -129,5 +129,5 @@ index c892db5df665..0a543170eba0 100644
|
||||
err_free_chan:
|
||||
free_channel(newchannel);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 41220b0a33db5269e7378c9823e9278d2139fc5f Mon Sep 17 00:00:00 2001
|
||||
From f46af309fd5418c77cd18184f2e239880cd46f9a 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 42/44] vmbus: Don't spam the logs with unknown GUIDs
|
||||
@ -26,5 +26,5 @@ index 0a543170eba0..120ee22c945e 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 79601618d933ba1ec0ce29c9ac93b8d3c2378e4d Mon Sep 17 00:00:00 2001
|
||||
From ba909c25e249651395c2826802eb4fa650e3c510 Mon Sep 17 00:00:00 2001
|
||||
From: James Bottomley <James.Bottomley@HansenPartnership.com>
|
||||
Date: Wed, 17 Feb 2016 16:49:38 -0800
|
||||
Subject: [PATCH 43/44] fs: add filp_clone_open API
|
||||
@ -60,5 +60,5 @@ index fbc5c7b230b3..94fe386e566d 100644
|
||||
{
|
||||
struct open_flags op;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From af8784a4b7d89b3514a8fb1e483dd2e9c4f8697e Mon Sep 17 00:00:00 2001
|
||||
From 4fa319e795c641456c96c2d966d8ec76747f2871 Mon Sep 17 00:00:00 2001
|
||||
From: James Bottomley <James.Bottomley@HansenPartnership.com>
|
||||
Date: Wed, 17 Feb 2016 16:51:16 -0800
|
||||
Subject: [PATCH 44/44] binfmt_misc: add persistent opened binary handler for
|
||||
@ -128,5 +128,5 @@ index 78f005f37847..4beb3d9e0001 100644
|
||||
return count;
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 86318f045a1b9a0898de425019d481a3c15b614d Mon Sep 17 00:00:00 2001
|
||||
From 47de76d9f030e70ac8e5f42d9e498481eecedb42 Mon Sep 17 00:00:00 2001
|
||||
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
Date: Thu, 2 Mar 2017 12:55:49 -0300
|
||||
Subject: [PATCH 01/13] tools build: Add test for sched_getcpu()
|
||||
@ -146,5 +146,5 @@ index 43899e0d6fa1..c3b180254f91 100644
|
||||
|
||||
int is_printable_array(char *p, unsigned int len);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 952f23a968dc443021374a092ebc1522fb48c8b9 Mon Sep 17 00:00:00 2001
|
||||
From da5a40d1d0d8fc760d70fb4e2329b5168d824598 Mon Sep 17 00:00:00 2001
|
||||
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
Date: Thu, 13 Oct 2016 17:12:35 -0300
|
||||
Subject: [PATCH 02/13] perf jit: Avoid returning garbage for a ret variable
|
||||
@ -66,5 +66,5 @@ index 95f0884aae02..f3ed3c963c71 100644
|
||||
while ((jr = jit_get_next_entry(jd))) {
|
||||
switch(jr->prefix.id) {
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 41dc10051f820561fe850fa4d9febfaa50c21156 Mon Sep 17 00:00:00 2001
|
||||
From 6146808b173170479e89ac9237c499dced36ea81 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sat, 23 Jul 2016 01:35:51 +0000
|
||||
Subject: [PATCH 03/13] hv_sock: introduce Hyper-V Sockets
|
||||
@ -1787,5 +1787,5 @@ index 000000000000..331d3759f5cb
|
||||
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
||||
+MODULE_LICENSE("Dual BSD/GPL");
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 34d8c74cbd5482b790c985ea885366e635b63c9a Mon Sep 17 00:00:00 2001
|
||||
From e502374ae9c5b5d1cffe0b8fa7a7b14534b7fbb1 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 04/13] vmbus: Don't spam the logs with unknown GUIDs
|
||||
@ -26,5 +26,5 @@ index d8bc4b910192..8df02f3ca0b2 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7b2830852653a4e47c98dd9693d6832161743db0 Mon Sep 17 00:00:00 2001
|
||||
From eb65b7a4edd8b72ba922c32bf1d9b997b974a276 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ng <alexng@messages.microsoft.com>
|
||||
Date: Sun, 6 Nov 2016 13:14:07 -0800
|
||||
Subject: [PATCH 05/13] Drivers: hv: utils: Fix the mapping between host
|
||||
@ -44,5 +44,5 @@ index bcd06306f3e8..e7707747f56d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ead3847566018d44d2fc2e79dfecfdcc4e6d6873 Mon Sep 17 00:00:00 2001
|
||||
From 4da45246d17432034de4774b183320f20db322a6 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ng <alexng@messages.microsoft.com>
|
||||
Date: Sun, 6 Nov 2016 13:14:10 -0800
|
||||
Subject: [PATCH 06/13] Drivers: hv: vss: Improve log messages.
|
||||
@ -101,5 +101,5 @@ index a76e3db0d01f..b1446d51ef45 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d15c33dd3ba5138ee46a64d3f76a6163b4701f46 Mon Sep 17 00:00:00 2001
|
||||
From 4f0fd69acfc6917614130bcacbd6ea85059172d9 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ng <alexng@messages.microsoft.com>
|
||||
Date: Sun, 6 Nov 2016 13:14:11 -0800
|
||||
Subject: [PATCH 07/13] Drivers: hv: vss: Operation timeouts should match host
|
||||
@ -44,5 +44,5 @@ index b1446d51ef45..4e543dbb731a 100644
|
||||
rc = hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL);
|
||||
if (rc) {
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ea235c65c2c3eb5cae3068c9520e80c208d8ff63 Mon Sep 17 00:00:00 2001
|
||||
From f48dc0763bdf80fef255fc2aa5d32dd105671069 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ng <alexng@messages.microsoft.com>
|
||||
Date: Sat, 28 Jan 2017 12:37:17 -0700
|
||||
Subject: [PATCH 08/13] Drivers: hv: vmbus: Use all supported IC versions to
|
||||
@ -488,5 +488,5 @@ index 489ad74c1e6e..956acfc93487 100644
|
||||
void hv_event_tasklet_disable(struct vmbus_channel *channel);
|
||||
void hv_event_tasklet_enable(struct vmbus_channel *channel);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4278768a02c183e260ab1bf04ac9ba7e47d7fb10 Mon Sep 17 00:00:00 2001
|
||||
From bc49cf7880800b1109e32ad42fe900f0a48f6c23 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Ng <alexng@messages.microsoft.com>
|
||||
Date: Sat, 28 Jan 2017 12:37:18 -0700
|
||||
Subject: [PATCH 09/13] Drivers: hv: Log the negotiated IC versions.
|
||||
@ -114,5 +114,5 @@ index f3797c07be10..89440c2eb346 100644
|
||||
hb_srv_version & 0xFFFF);
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1c55d06b7596934896862ca62282a02cd4b8b9eb Mon Sep 17 00:00:00 2001
|
||||
From 0229185f781c9705faa82f7a39afc66c1a9341be Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sun, 26 Mar 2017 16:42:20 +0800
|
||||
Subject: [PATCH 10/13] vmbus: fix missed ring events on boot
|
||||
@ -52,5 +52,5 @@ index e7949b64bfbc..2fe024e86209 100644
|
||||
|
||||
void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid)
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e66007ddcb16a99ab47ce6364ef0b4c294cf619f Mon Sep 17 00:00:00 2001
|
||||
From 4f5040387a5cf098a230c71edc40a3a13c123c6e Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 29 Mar 2017 18:37:10 +0800
|
||||
Subject: [PATCH 11/13] vmbus: remove "goto error_clean_msglist" in
|
||||
@ -56,5 +56,5 @@ index 1606e7f08f4b..1caed01954f6 100644
|
||||
vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
|
||||
kfree(open_info);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 18235b7781b0f9450fa7d107702e7c55fbf49e69 Mon Sep 17 00:00:00 2001
|
||||
From 8d06c10253862ca788f2c886e3bfb1fec6737924 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Fri, 24 Mar 2017 20:53:18 +0800
|
||||
Subject: [PATCH 12/13] vmbus: dynamically enqueue/dequeue the channel on
|
||||
@ -173,5 +173,5 @@ index 956acfc93487..9ee292b28e41 100644
|
||||
|
||||
void vmbus_setevent(struct vmbus_channel *channel);
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c0bf7018537aaf25e54895cda9e87f229bcb911f Mon Sep 17 00:00:00 2001
|
||||
From 44b7489e07ad45b1ffe3d5190ea759b8d395e23e Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Thu, 6 Jul 2017 21:37:11 +0000
|
||||
Subject: [PATCH 13/13] vmbus: fix the missed signaling in hv_signal_on_read()
|
||||
@ -43,5 +43,5 @@ index 9ee292b28e41..a87757cf277b 100644
|
||||
|
||||
return;
|
||||
--
|
||||
2.13.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.9.44
|
||||
image: linuxkit/kernel:4.9.46
|
||||
cmdline: "console=tty0 console=ttyS0"
|
||||
init:
|
||||
- linuxkit/init:6d11a1f9d299d3425e78cce80dfba8b236d20412
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user