* debian/changelog: Update.

* debian/patches/features/all/xen/README: Add informations about patch source.
* debian/patches/features/all/xen/fedora-2.6.18-36156.patch: Add.
* debian/patches/features/all/xen/fedora-36252.patch: Remove.
* debian/patches/series/7-extra: Update.

svn path=/dists/sid/linux-2.6/; revision=7917

debian/changelog

@@ -4,6 +4,7 @@ linux-2.6 (2.6.18-7) UNRELEASED; urgency=low
   * Emit conflict lines for initramfs generators. (closes: #400305)
   * Update vserver patch to 2.0.2.2-rc8.
   * s390: Add patch to fix posix types.
+  * Update xen patch to changeset 36156 from fedora 2.6.18 branch.
 
   [ Martin Michlmayr ]
   * r8169: Add an option to ignore parity errors.
@@ -16,7 +17,7 @@ linux-2.6 (2.6.18-7) UNRELEASED; urgency=low
   * sata: Avoid null pointer dereference in SATA Promise.
   * cifs: Set CIFS preferred IO size.
 
- -- Bastian Blank <waldi@debian.org>  Sat,  2 Dec 2006 10:40:12 +0100
+ -- Bastian Blank <waldi@debian.org>  Sun,  3 Dec 2006 15:43:38 +0100
 
 linux-2.6 (2.6.18-6) unstable; urgency=low
 

debian/patches/features/all/xen/README

@@ -0,0 +1 @@
+This patch is from http://hg.et.redhat.com/kernel/linux-2.6.18-xen.

debian/patches/series/7-extra

@@ -1,7 +1,7 @@
 + features/all/vserver/vs2.0.2.2-rc8.patch *_vserver *_xen-vserver
 + features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
 + features/all/xen/vserver-clash.patch *_xen-vserver
-+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
++ features/all/xen/fedora-2.6.18-36156.patch *_xen *_xen-vserver
 + features/all/xen/vserver-update.patch *_xen-vserver
 + bugfix/r8169-ignore-parity.patch arm
 + bugfix/arm/r8169-ignore-parity-n2100.patch arm