From dcb3ff6aa0a5d013264bfc43762d4179b44a3ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= <fs@debian.org>
Date: Mon, 20 Mar 2006 10:17:10 +0000
Subject: [PATCH] Prepare 2.6.16. uncomment failing patches.

svn path=/dists/trunk/linux-2.6/; revision=6225
---
 debian/changelog                                       |  4 ++--
 debian/patches/series/{0experimental.1 => 1}           | 10 +++++-----
 .../patches/series/{0experimental.1-extra => 1-extra}  |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename debian/patches/series/{0experimental.1 => 1} (80%)
 rename debian/patches/series/{0experimental.1-extra => 1-extra} (60%)

diff --git a/debian/changelog b/debian/changelog
index 5af3c5fcb..758a7a572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-linux-2.6 (2.6.15+2.6.16-rc6-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-1) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
-  * New upstream release candidate.
+  * New upstream release.
   * Default to initramfs-tools 0.55 or higher on s390.
 
   [ maximilian attems ]
diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/1
similarity index 80%
rename from debian/patches/series/0experimental.1
rename to debian/patches/series/1
index e5dba9dfb..4cd504030 100644
--- a/debian/patches/series/0experimental.1
+++ b/debian/patches/series/1
@@ -16,15 +16,15 @@
 + sparc64-atyfb-xl-gr.patch
 + mips-makefile.patch
 + mips-arch-makefile.patch
-+ mips-gettimeofday.patch
-+ mips-ide-scan.patch
+#FIXME + mips-gettimeofday.patch
+#FIXME + mips-ide-scan.patch
 + mips-sb1-probe-ide.patch
-+ mips-sb1-irq-hazard.patch
+#FIXME + mips-sb1-irq-hazard.patch
 + mips-sb1-eth-1480.patch
 + mips-sb1-eth-napi.patch
 + mips-sb1-duart.patch
-+ mips-io-bad-code.patch
+#FIXME + mips-io-bad-code.patch
 + video-vino-64-bit-fix-kernel.diff
 + s390-drivers-ccw-uevent-modalias.patch
 + s390-drivers-ccw-uevent-cleanup.patch
-+ s390-drivers-subchannel-fix.patch
+#FIXME + s390-drivers-subchannel-fix.patch
diff --git a/debian/patches/series/0experimental.1-extra b/debian/patches/series/1-extra
similarity index 60%
rename from debian/patches/series/0experimental.1-extra
rename to debian/patches/series/1-extra
index ed6de817d..4053ee380 100644
--- a/debian/patches/series/0experimental.1-extra
+++ b/debian/patches/series/1-extra
@@ -1,8 +1,8 @@
-+ maclist.patch arm armeb
-+ arm-nslu2-maclist.patch arm armeb
+#+ maclist.patch arm armeb
+#+ 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
+#+ mips-tulip.patch mipsel
+#+ mips-tulip_dc21143.patch mipsel