rebase patches on top of Ubuntu-4.15.0-24.26
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
b293e26829
commit
c0514fa336
10 changed files with 16 additions and 137 deletions
|
@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
||||
index e536977e7b6d..4c63296eb5a8 100644
|
||||
index 234d03abcb75..2e7d3aee779d 100644
|
||||
--- a/virt/kvm/kvm_main.c
|
||||
+++ b/virt/kvm/kvm_main.c
|
||||
@@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);
|
||||
|
@ -24,6 +24,3 @@ index e536977e7b6d..4c63296eb5a8 100644
|
|||
module_param(halt_poll_ns_grow, uint, 0644);
|
||||
EXPORT_SYMBOL_GPL(halt_poll_ns_grow);
|
||||
|
||||
--
|
||||
2.14.2
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue