Author: waldi Date: Mon Sep 25 22:11:13 2006 New Revision: 7526 Added: dists/trunk/linux-2.6/debian/patches/features/all/xen/vserver-clash.patch (contents, props changed) Modified: dists/trunk/linux-2.6/debian/patches/series/1-extra dists/trunk/linux-2.6/debian/patches/series/2-extra
Log: * debian/patches/features/all/xen/vserver-clash.patch: Add. * debian/patches/series/1-extra, debian/patches/series/2-extra: Update. Added: dists/trunk/linux-2.6/debian/patches/features/all/xen/vserver-clash.patch ============================================================================== --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/features/all/xen/vserver-clash.patch Mon Sep 25 22:11:13 2006 @@ -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) Modified: dists/trunk/linux-2.6/debian/patches/series/1-extra ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1-extra (original) +++ dists/trunk/linux-2.6/debian/patches/series/1-extra Mon Sep 25 22:11:13 2006 @@ -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 Modified: dists/trunk/linux-2.6/debian/patches/series/2-extra ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/2-extra (original) +++ dists/trunk/linux-2.6/debian/patches/series/2-extra Mon Sep 25 22:11:13 2006 @@ -1 +1,3 @@ + hppa.patch hppa ++ features/all/xen/vserver-clash.patch *_xen-vserver ++ features/all/xen/fedora-36175.patch *_xen *_xen-vserver _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
