rebase patches onto 2.6.1

[pve-qemu-kvm.git] / debian / patches / pve / 0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch

diff --git a/debian/patches/pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch b/debian/patches/pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch
index a1e5410e6ff99d3ac362f17dc6b14dd04640e27c..2553ee9c436cb5e3d8cf23ff745e679d169ce85c 100644 (file)
--- a/debian/patches/pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch
+++ b/debian/patches/pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch
@@ -1,7 +1,7 @@
-From 3019628843fecf84f01353f26b618cf74e23b93b Mon Sep 17 00:00:00 2001
+From 23a15e3819093d32fbf15709bbe1fe9e3869b171 Mon Sep 17 00:00:00 2001
 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Date: Wed, 6 Apr 2016 16:46:11 +0200
-Subject: [PATCH 51/52] net: NET_CLIENT_OPTIONS_KIND_MAX changed
+Subject: [PATCH 51/55] net: NET_CLIENT_OPTIONS_KIND_MAX changed
 
 s/NET_CLIENT_OPTIONS_KIND_MAX/NET_CLIENT_OPTIONS_KIND__MAX/
 ---
@@ -9,7 +9,7 @@ s/NET_CLIENT_OPTIONS_KIND_MAX/NET_CLIENT_OPTIONS_KIND__MAX/
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/net.c b/net/net.c
-index 8580cc0..369d587 100644
+index 0e3f231..2b9de86 100644
 --- a/net/net.c
 +++ b/net/net.c
 @@ -1333,7 +1333,7 @@ int64_t qmp_get_link_status(const char *name, Error **errp)