[kernel] r6229 - in dists/sid/linux-2.6/debian: arch/amd64 arch/i386 patches patches/series

[Bastian Blank]

Author: waldi
Date: Mon Mar 20 10:44:58 2006
New Revision: 6229

Removed:
   dists/sid/linux-2.6/debian/patches/vserver-xen-clash.patch
   dists/sid/linux-2.6/debian/patches/xen-tree-merge-21966.patch
Modified:
   dists/sid/linux-2.6/debian/arch/amd64/defines
   dists/sid/linux-2.6/debian/arch/i386/defines
   dists/sid/linux-2.6/debian/patches/series/1-extra
Log:
* debian/arch/amd64/defines, debian/arch/i386/defines:
  Disable xen and xen-vserver subarches.
* debian/patches/series/1-extra: Remove xen patches.
* debian/patches/vserver-xen-clash.patch,
  debian/patches/xen-tree-merge-21966.patch: Remove.


Modified: dists/sid/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/defines	Mon Mar 20 10:44:58 2006
@@ -9,8 +9,6 @@
 kernel-header-dirs: x86_64
 subarches:
  vserver
- xen
- xen-vserver
 
 [image]
 depends: e2fsprogs (>= 1.35-7)

Modified: dists/sid/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/defines	Mon Mar 20 10:44:58 2006
@@ -9,7 +9,6 @@
 kernel-header-dirs: i386
 subarches:
  vserver
- xen
 
 [image]
 suggests: grub | lilo (>= 19.1)

Modified: dists/sid/linux-2.6/debian/patches/series/1-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/1-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/1-extra	Mon Mar 20 10:44:58 2006
@@ -2,7 +2,5 @@
 #+ arm-nslu2-maclist.patch arm armeb
 + vserver-version.patch *_vserver *_xen-vserver
 + vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-xen-clash.patch *_xen-vserver
-+ xen-tree-merge-21966.patch *_xen *_xen-vserver
 #+ mips-tulip.patch mipsel
 #+ mips-tulip_dc21143.patch mipsel