From beb815854e11194725111160c0d07977a78436f3 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Mon, 25 Sep 2006 22:11:13 +0000
Subject: [PATCH] * debian/patches/features/all/xen/vserver-clash.patch: Add. *
 debian/patches/series/1-extra, debian/patches/series/2-extra: Update.

svn path=/dists/trunk/linux-2.6/; revision=7526
---
 .../patches/features/all/xen/vserver-clash.patch | 16 ++++++++++++++++
 debian/patches/series/1-extra                    |  1 -
 debian/patches/series/2-extra                    |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/features/all/xen/vserver-clash.patch

diff --git a/debian/patches/features/all/xen/vserver-clash.patch b/debian/patches/features/all/xen/vserver-clash.patch
new file mode 100644
index 000000000..11420026a
--- /dev/null
+++ b/debian/patches/features/all/xen/vserver-clash.patch
@@ -0,0 +1,16 @@
+diff -urN test1/net/core/dev.c test2/net/core/dev.c
+--- test1/net/core/dev.c	2006-09-25 21:01:06.000000000 +0200
++++ test2/net/core/dev.c	2006-09-25 21:01:44.000000000 +0200
+@@ -113,11 +113,11 @@
+ #include <linux/wireless.h>
+ #include <net/iw_handler.h>
+ #include <asm/current.h>
++#include <linux/vs_network.h>
+ #include <linux/audit.h>
+ #include <linux/dmaengine.h>
+ #include <linux/err.h>
+ #include <linux/ctype.h>
+-#include <linux/vs_network.h>
+ 
+ /*
+  *	The list of packet types we will receive (as opposed to discard)
diff --git a/debian/patches/series/1-extra b/debian/patches/series/1-extra
index 346d98cf3..3c8aaf9eb 100644
--- a/debian/patches/series/1-extra
+++ b/debian/patches/series/1-extra
@@ -1,6 +1,5 @@
 + debian/vserver-version.patch *_vserver *_xen-vserver
 + features/all/vserver/vs2.0.2.1-t8.patch *_vserver *_xen-vserver
-+ features/all/xen/fedora-36175.patch *_xen *_xen-vserver
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel
 + mips-dec-scsi.patch mipsel
diff --git a/debian/patches/series/2-extra b/debian/patches/series/2-extra
index 789944485..eb3d6b716 100644
--- a/debian/patches/series/2-extra
+++ b/debian/patches/series/2-extra
@@ -1 +1,3 @@
 + hppa.patch hppa
++ features/all/xen/vserver-clash.patch *_xen-vserver
++ features/all/xen/fedora-36175.patch *_xen *_xen-vserver